import routine
import button fix
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype

Conflicts:
	app/controllers/pages_controller.rb