Refactor views
Merge remote-tracking branch 'ykzts/refactor-views'

Conflicts:
	config/routes.rb