updated routes

Conflicts:
	app/views/page/configuration.html.erb