integrate Alex branch
GAE: Show and select map positions for campuses
merge with andrew
GAE add maps to lots - partial
GAE marker on map
Merge remote-tracking branch 'github/master'