bower
Merge branch 'develop' of github.com:stdrickforce/inori into develop

Conflicts:
	bower.json