Test for #2055 in develop
fix unlocalized pks in templates
don't add the auth.User admin if it's not in the admin
Merge pull request #2060 from ojii/develop

don't add the auth.User admin if it's not in the admin
Merge pull request #2058 from FinalAngel/feature/fixes

Frontend fixes
Merge pull request #2063 from yakky/feature/unlocalize_placeholder_pk_30

Unlocalize pks
Merge branch 'develop' of github.com:divio/django-cms into feature/fixes