Merge remote-tracking branch 'boiler/master'

Conflicts:
	.bowerrc
	.gitignore
	README.md
	bower.json
	client.json
	package.json