rdocia
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/application_controller.rb