rebased with develop branch after another refactor of database functionality
Merge branch 'UserSubmission' of https://github.com/Classlocus/ClassLocus into UserSubmission