Fixing critical database errors that could prevent messages from being sent
Fixing minor errors
Merge pull request #1 from wCross-Technologies/nightly

Merging latest code changes into stable branch