Merge branches 'staging' and 'master'
Merge branch 'staging'
Adding serverside database code