Update database code
Merge branch 'master' of ssh://github.com/sophorsk/macathon