Repairs (?) ORM.
Merge branch 'master' of github.com:OT-SIMS-2013/server