orm changes
Merge branch 'dev' of github.com:Anthon95/WorstFrameworkEver into dev