admin routing
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/kantoliinary/kantoliina