build new version
build new version
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into bugfix/loader

Conflicts:
	Resources/public/dist/app.min.1394788820537.css
	Resources/public/dist/app.min.1395053641237.css
	Resources/public/dist/app.min.1395064368652.css
	Resources/public/dist/app.min.1395064368652.js
	Resources/public/dist/app.min.js
	Resources/views/Admin/index.html.dist.twig
build new version