Fixed issue with requirejs not loading on android.
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler
fixed names
fixed button not working
Merge remote-tracking branch 'origin/dev.tim.chandler' into dev.gab
Merge remote-tracking branch 'origin/dev.dms' into dev.gab
added map
Merge remote-tracking branch 'origin/dev.dms' into dev.gab

Conflicts:
	www/index.html
Merge remote-tracking branch 'origin/dev.gab' into dev.dms
Merge from Gabe