Changed escape function
Merge branch 'development' of ssh://github.com/nijave/apporchard into development