pudated husky-lib
Merge branch 'master' into develop

Conflicts:
	Resources/public/dist/app.min.1403774308754.css
	Resources/public/dist/app.min.1403794556762.css
	Resources/public/dist/app.min.1404113278589.css
	Resources/public/dist/app.min.1404113278589.js
	Resources/public/js/vendor/husky/husky.min.js
	Resources/views/Admin/index.html.dist.twig