Fix escaping for cached content
Merge branch 'patch-1' of git://github.com/shulcsm/django-cms into shulcsm-patch-1
added test for #1656
Merge branch 'develop' into shulcsm-patch-1
fixed assertNumQueries