Small modifications to edit template
Map view enabled
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm

Conflicts:
	app/views/worksheet/edit.html.erb