fixed some toolbar login issues and added the template menu as a nested menu
Merge branch 'develop' of github.com:divio/django-cms into develop