mapper: value mapping moved to adapter & mapper moved to querybuilder [closes #81]
Merge branch 'mapper-refactoring' into develop