Merge remote-tracking branch 'github/mihai'
Merge remote-tracking branch 'github/mihai'
integrate GAE marker - set and modify map position for campuses
icons