fixes #1951 and #1945
fix test
removed print statement
Merge pull request #1954 from digi604/fixes

fixes #1951 and #1945
fixes a json encoding error with gettext proxies
Merge pull request #1958 from digi604/fixes

fixes a json encoding error with gettext proxies
fixes ordering of plugins during copy
fixed tests
Merge pull request #1959 from digi604/fixes

fixes copy plugins for out of order plugin trees
allow switching from basic-info to advanced settings and vise versa
clipboard plugins work now for breadcrumb
Merge pull request #1960 from digi604/languages

various fixes
adds template field to advanced settings. fixes #1952
fixed tests
Merge pull request #1970 from digi604/fix-1952

Fix #1952
Merge branch 'develop' of github.com:divio/django-cms into feature/cleanups

Conflicts:
	cms/templates/admin/page_submit_line.html