sencha app upgrade + merge conflict resolution in app.json
architect upgrade + cmd enable
archive from build 1337
Merge branch '3.0'