editor for specific mapping. Fix offset calculation
Merge branch 'ace' into gh-pages-commontk