[added] marine armor bracer object templates
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[fixed] incorrect template names for rebel biceps
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[fixed] another reb bracer template omission
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
Merge branch 'Development' into unstable
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[added] Rebel Battle armor object templates
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[fixed] missing serverobjects entry for rebel battle armor
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[Fixed?] Take 2 on Rebel battle armor objects
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[fixed] leftover "marine" entries
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[redo] all the rebel battle armor templates
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable
[fixed] missing objects.lua entry
Merge branch 'unstable' of github.com:kinshi/tarkin_scripts into unstable