Update to Rails 4.1 & admin area
Merge branch 'master' of https://github.com/khcr/way

Conflicts:
	app/views/pages/home.html.erb
	db/schema.rb