Rolling back

Rolling back changes to the userqueries model. The made changes give an
error when signing in.
minor updates
minor changes
minor updates
Adding upload function to the datainserter controller.
Merge branch 'master' of https://github.com/hasan37/cocoportal