fixed testsuite
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge pull request #1796 from FinalAngel/develop

Refactors messages system and drop dialog
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
this really sets the correct variable