Re-add Database with modifications
Merge branch 'develop' of https://github.com/rodriguezrs/ghost-0.4-with-search into develop