Merging the View & Add together

Still more work to do but the basics are working
A ton of changes to the new version. Map now goes full
view/addbribe switchable modes fix
fixed touch events and added initial clustering functionality
clustering fully functional
Lots of cleanup prior to merge
Mobile updates
Futher tweaks
Merging it all together