Design updates
Work on forms

Merge branch 'master' of https://github.com/soberstadt/uwsp-virtual-tour-server

Conflicts:
	app/views/tours/_form.html.erb