Automatic commit for Bower
Merge branch 'master' into dev

Conflicts:
	.gitignore
	.travis.yml