Merge branch 'logging-test' of https://github.com/MaximUS-Team/cryoWeb
Merge pull request #13 from MaximUS-Team/testse

Add test settings showing and ability to update.
Merge branch 'master' of https://github.com/MaximUS-Team/cryoWeb
Merge branch 'logging-test'
Merge remote-tracking branch 'origin/master' into logging-test
Logging (Almost complete)

Issues in uploads.js, logging functional in app.js