refactored map code
Merge branch 'master' into angular
Merge branch 'master' of https://github.com/bchiatt/enlighTN into kayla