Changes since tag 7.2.0

commit c4987acd08b929ad8342bafcf05c551c136aabaa
Author: Rythal <illustriousdreamer@gmail.com>
Date:   Fri Aug 18 15:02:06 2017 -0400

    Adds combat window frame that use to be in main carbonite.

