recovered some views
Merge branch 'recovery'

Conflicts:
	db/development.sqlite3
added route