Refactor - moved stuff from ContextHelper to DatabaseContext where appropriate
tryin to fix missing commit
Merge branch 'master' of https://github.com/arleth/Utils