Minor changes.
Moved database calls off of the Application thread and into a Task.
Merge origin/master
Bugfixing.