https://github.com/massiveart/POOL-ALPIN/issues/145
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into bugfix/Navigation-update

Conflicts:
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1414602630381.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1415096168276.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1415108332771.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.js
	src/Sulu/Bundle/AdminBundle/Resources/views/Admin/index.html.dist.twig
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into bugfix/Navigation-update
Merge pull request #508 from sulu-cmf/bugfix/Navigation-update

 [BUGFIX] Fixed navigation behaviour if clicking on the user name on the navigation side bar