[reset] Reset branch  back to commit prior to merge from unstable
Rebel Battl/Marine armor re-add of templates
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable