Updated data mapper to required methods
Simple dm update
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git