Datamapper updates
Merge branch 'master' of https://github.com/wazaap/2SemesterProjekt.git