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
Merge pull request #1661 from czpython/patch-2

Fixed #1453
Fixed Issue #1212
Fixed Issue #1212
Merge branch 'develop' into patch-2
Merge branch 'develop' of github.com:divio/django-cms into patch-2