Bower work
Bower config
Merge branch 'master' of git://github.com/mattalexx/ASDAdmBundle

Conflicts:
	README.md
	Resources/config/bower/bower.json