test
Merge branch 'master' of https://github.com/rexos/kokko

Conflicts:
	config/routes.rb
admin refactor