fix tests and fixes #2867
fixes #2868
Merge pull request #2869 from digi604/fix-2867

fix tests and fixes #2867 (redirect preview only in edit mode)
authors change
Merge pull request #2870 from digi604/fix-2868

fixes #2868
Merge branch 'develop' of github.com:divio/django-cms into develop