Avoid jshint warning in tx.js
Simplify jsonrewriter
Activity Log: Show canceled orders properly. Fixes #433
Activity freeze quick fix
Merge remote-tracking branch 'remotes/origin/develop'
ver