Fix map xtype collision
Merge branch 'master' of github.com:JarvusInnovations/SeptaMobi