grunt recompile
Merge branch 'concepthouse'
deleted some files
Merge branch 'master' into concepthouse
add changes to the map, umbralla and db elements, map not yet working