Update composer.json
Merge branch 'master' of git://github.com/sulu-cmf/SuluAdminBundle

Conflicts:
	composer.json
Update composer.json
Update composer.json
fixed version number
fixed color bug
Merge branch 'master' of git://github.com/sulu-cmf/SuluAdminBundle into develop

Conflicts:
	Resources/public/dist/app.min.1404113380958.css
	Resources/public/dist/app.min.1404113380958.js
	Resources/public/dist/app.min.1404202733408.css
	Resources/public/dist/app.min.1404202733408.js
	Resources/public/dist/app.min.1404222875011.css
	Resources/public/dist/app.min.1404222875011.js
	Resources/views/Admin/index.html.dist.twig
added build files