Comment out database code for now so that server will run
Merge branch 'fixServerPathBug' into develop
Merge branch 'develop'