Bowerized
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/views/index.hbs