Update bower.json
Update package.json
Merge remote-tracking branch 'origin/master' into pinny-0.1.0

Conflicts:
	bower.json
	package.json