Update MageSetup to master branch, remove fbrnc/aoe_jscsststamp
Merge remote-tracking branch 'origin/master'