Updating FieldMap
Merge branch 'oppfin' of https://github.com/searchbox/framework into oppfin