Database crazy person fixes :) ( <3 kevin)
Merge branch 'master' of https://github.com/Astron/Astron