Fixed macro saving when shrinking the number of teams. Enabled useMacros checkbox.
First pass at code cleanup
Localization updates
Merge branch 'develop'