Merge pull request #390 from fahadhatib/develop

Fixes for escaping and unescaping previously illegal characters
Merge pull request #391 from fahadhatib/develop

Develop
Correctly show totals for movements
Merge pull request #392 from timschofield/develop

Correctly show totals for movements