Branded and added the z-index back onto the panel (oops)
added user marker
Facebook WIP. Suspended for now.
Merge remote-tracking branch 'origin/dev.gab' into dev.tim.chandler
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler
Disabled facebook init.
Removed placeholders.
Trying to fix build...
Fix image path and add notifications
Now using ID.
Fixed templates.
Temp optimization.
Notifications png
Merge remote-tracking branch 'origin/dev.tim.chandler' into dev.dms
Viewport change
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler

Conflicts:
	www/map.html
	www/test.html
	www/test2.html
Added operators markers
set oversized spastic mode == false for markers
Merge remote-tracking branch 'origin/dev.tim.chandler' into dev.gab
Map tweaks.