Lots of changes, big and small
Merge branch 'master' of https://github.com/mbronsema/koshinkai

Conflicts:
	app/views/adminpanels/index.html.erb