Merge pull request #776 from nZEDb/dev

Dev
Merge pull request #781 from nZEDb/dev

Dev
Merge pull request #784 from nZEDb/dev

Major bug in escapeString causing all kinds of issues.
merging
Merge pull request #786 from nZEDb/master

Master to Dev