Merge branch 'master' of https://github.com/mbronsema/koshinkai

Conflicts:
	app/views/events/index.json.jbuilder
..