adding sample entities and mapping and also adding tests
Merge branch 'master' of https://github.com/nortal-lab/app into DariusBranch