Updates
Beginning to add views
Merge branch 'master' into weronica

Conflicts:
	config/routes.rb
	db/schema.rb