committing for merge
Merge branch 'master' of https://github.com/hapaman/bloc-jams into bloc-jams-spa

Conflicts:
	public/javascripts/app.js.map
Merge branch 'master' of https://github.com/hapaman/bloc-jams into bloc-jams-spa
committing