Merge branch 'hotfix/husky-version'
updated composer version
tmp
tmp
fixed bug
downgraded husky
Merge branch 'hotfix/scrolling' of git://github.com/sulu-cmf/SuluAdminBundle into develop

Conflicts:
	Resources/public/dist/app.min.1406798400517.css
	Resources/public/dist/app.min.1406805200954.js
	Resources/public/dist/app.min.css
	Resources/public/js/vendor/husky/husky.css
	Resources/public/js/vendor/husky/husky.js
	Resources/public/js/vendor/husky/husky.min.css
	Resources/public/js/vendor/husky/husky.min.js
	Resources/views/Admin/index.html.dist.twig
	Resources/views/Admin/index.html.twig
	composer.json
fixed bug
husky
husky
husky
Merge branch 'hotfix/scrolling' into develop

Conflicts:
	Resources/public/dist/app.min.1406294301100.css
	Resources/public/dist/app.min.1406728469005.css
	Resources/public/dist/app.min.1406819510410.css
	Resources/public/dist/app.min.1406819510410.js
	Resources/public/dist/app.min.css
	Resources/public/dist/app.min.js
	Resources/public/js/vendor/husky/husky.css
	Resources/public/js/vendor/husky/husky.min.css
	Resources/public/js/vendor/husky/husky.min.js
	Resources/views/Admin/index.html.dist.twig
	composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into develop

Conflicts:
	Resources/public/dist/app.min.1406294301100.css
	Resources/public/dist/app.min.1406808974623.css
	Resources/public/dist/app.min.1406820026256.css
	Resources/public/dist/app.min.1406820026256.js
	Resources/public/dist/app.min.js
	Resources/public/js/vendor/husky/husky.js
	Resources/public/js/vendor/husky/husky.min.js
	Resources/views/Admin/index.html.dist.twig
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into feature/category-translations
translations
merged with origin