some more testing for map layers, and a few changes to the text
Merge branch 'dev'
Added DB Model
Some views for markers, admin interface for markers, add markers layer on map
Added markers list
Fixed where the marker list happens
more faffing about
Merge branch 'master' into dev
still looking for extra layers