fixing numerous bugs
Merge branch 'map_bug_fix' into develop
bumping version for mapper
Merge branch 'develop' into btest