Merge pull request #2413 from FinalAngel/develop

migration fix
do not reload after new settings are set
Merge branch 'develop' of github.com:divio/django-cms into develop