various changes
Merge https://github.com/jasmingacic/katoadhoc

Conflicts:
	app/views/layouts/application.html.erb