Fixed delete confirmation for translations
Merge branch 'feature/fix-translation-deletion-confirmation-1.4' into feature/venv-tests
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Merge pull request #1267 from ojii/feature/fix-translation-deletion-confirmation-1.4

Fixed delete confirmation for translations
reversion 1.6 support
Merge branch 'feature/reversion-1.6-support' into feature/venv-tests

Conflicts:
	cms/tests/reversion_tests.py
added 1.6 reversion support
Merge branch 'feature/reversion-1.6-support' into feature/venv-tests
updated tests_require in setup.py
add extra_context variable in page admin
Merge branch 'develop' of github.com:divio/django-cms into develop
A test for issue #1211 and pull request #1255
Minor patch to enforce migrations follow database structure changes
When publisher2 migration in cms deletes the cmspluginpublic table
This patch forces the dependent plugins to rename in sync avoiding a
MySQL migration error in south
added csrf.js to plugin_change_form.html, fixes #1259

@FinalAngel, @neo64bit, please check if this is OK
removed calls to cmsPatchCSRF since that function isn't defined anymore

@FinalAngel, @neo64bit, please check if this is OK
Merge pull request #1270 from piquadrat/feature/mysql-migration-fixes

Minor patch to enforce migrations follow database structure changes
Making cms/models more pep8 compliant

Fixing specially:
		* Trailing whitespaces
		* Number of empty lines between classes/methods
		* Comments
Merge branch 'develop' of github.com:divio/django-cms into feature/venv-tests
Merge pull request #1261 from ojii/feature/venv-tests

VIRTUALENV TESTS OMG YEAH!
experimental travis conf