Added database, admin scaffold
Merge commit 'hrabbit/master'