Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gruntfile.coffee
	bower.json
	package.json