Merge branch 'develop' into fast_containers

Conflicts:
	philo/templatetags/containers.py

diff --cc philo/templatetags/containers.py
index 3370c78,be94a3d..2c55034
--- 1/philo/templatetags/containers.py
--- 2/philo/templatetags/containers.py
+++ b/philo/templatetags/containers.py
@@@ -71,21 -47,10 +71,11 @@@ class ContainerNode(template.Node)
                else:
                        # Otherwise it's a contentlet.
                        try:
 -                              contentlet = page.contentlets.get(name__exact=self.name)
 -                              content = contentlet.content
 -                      except ObjectDoesNotExist:
 +                              contentlet = container_context.contentlets[self.name]
 +                      except KeyError:
                                content = ''
-                               
-                               if '{%' in content or '{{' in content:
-                                       try:
-                                               content = template.Template(contentlet.content, name=contentlet.name).render(context)
-                                       except template.TemplateSyntaxError, e:
-                                               if settings.DEBUG:
-                                                       content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, e))
-                                               else:
-                                                       content = settings.TEMPLATE_STRING_IF_INVALID
-                       content = mark_safe(content)
 +                      else:
 +                              content = contentlet.content
                return content