Merge pull request #153 from sulu-cmf/hotfix/husky

[HOTFIX] Udated husky version
husky
Merge pull request #157 from sulu-cmf/hotfix/husky

[HOTFIX] husky
Update composer.json
build new version
Merge pull request #158 from sulu-cmf/hotfix/login-form

[HOTFIX] Changed email to username
Update composer.json
Merge branch 'master' of git://github.com/sulu-cmf/SuluAdminBundle into develop

Conflicts:
	Resources/public/dist/app.min.1408456047242.css
	Resources/public/dist/app.min.1408543613519.css
	Resources/public/dist/app.min.1408549927540.css
	Resources/public/dist/app.min.1408549927540.js
	Resources/public/js/vendor/husky/husky.min.js
	Resources/views/Admin/index.html.dist.twig
	composer.json