Merge branch 'develop' into patch-1

Conflicts:
	cms/tests/plugins.py
Merge branch 'patch-1' of git://github.com/shulcsm/django-cms into shulcsm-patch-1
Fixed #1453
added test for #1656
Merge branch 'develop' into shulcsm-patch-1
fixed assertNumQueries
Merge pull request #1661 from czpython/patch-2

Fixed #1453
Merge branch 'develop' into updated-japanese-locale
Fixed Issue #1212
Fixed Issue #1212
Merge branch 'develop' into patch-2
Merge branch 'develop' of github.com:divio/django-cms into patch-2
makemessages
tx push
tx pull
compilemessages
Merge branch 'updated-japanese-locale' into develop
Modified move_plugin to checkfor plugin limits.
Fixed PlaceholderAdmin to properly display plugin name.
Merge pull request #1666 from czpython/patch-4

Fixed PlaceholderAdmin to properly display plugin name.
Fixed Moving a plugin to a new placeholder ignores placeholder limits (#1646)
Merge branch 'develop' of github.com:divio/django-cms into issue-1646