add top page
Merge branch 'master' into top

Conflicts:
	config/routes.rb