DiffMerge the final script differences.
Merge pull request #17 from volusion-angular-themes/fixerup-2nd

DiffMerge the final script differences.