Intermediate
Merge branch 'master' of https://github.com/SoEnguy/HumanMap
Marker generator added in trunk and branch