Merge branch 'master' of github.com:chakatodd/rt-extension-assettracker