Merge branch 'feature/better-json-mapping' into development
Merge branch 'development' of https://github.com/MerideanGroup/peoplevector into development