More DAO stuff
Merge branch 'master' of github-mackoder:mackoder/motobike