major markup changes
major markup changes again
markup changes
stylistic changes
css changes zahid
changed styling to red
fixed sidebar
merging develop into branch - still problems with js and modal
fix for modal
location search fixed
Merge branch 'zahid-styling' of https://github.com/rubenkostucki/nomnivor into zahid-styling

Conflicts:
	app/assets/javascripts/map.js
	app/views/map/show.html.erb
side bar rendering but in wrong place
side bar in correct position
style and positioning