Update by map and property changes
document changes
some small changes
Merge branch 'herokuchanges', remote branch 'origin/newherokuchanges' into herokuchanges