latest changes for map fields
merge conflict
Updated backbone.hs
Merge branch 'phase3-testing' into feedhenry3