Merge branch 'D532' of github.com:loadedcommerce/loaded7 into D532
[IC] general cleanup