small change styling
Merge branch 'master' into concepthouse
add changes to the map, umbralla and db elements, map not yet working
last push for merge with master
Merge remote-tracking branch 'origin/concepthouse'
update stats