initial map code
CSS changes for the map display
Merge branch 'master' into map

Conflicts:
	app/index.html
Centered the map on the users location
Merge branch 'map'