Switched to Gulp & configured Bower
Merge branch 'master'

Conflicts:
	Gruntfile.js
	package.json