fixed variable
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into feature/sulu_location

Conflicts:
	Resources/public/dist/app.min.1407141469284.css
	Resources/public/dist/app.min.1407141469284.js
	Resources/public/dist/app.min.1407145345431.css
	Resources/public/dist/app.min.1407145345431.js
	Resources/public/dist/app.min.1407145396263.css
	Resources/public/dist/app.min.1407145396263.js
	Resources/views/Admin/index.html.dist.twig