Merge pull request #39 from CruGlobal/design

Editable wizard
Use staging server URL
Merge remote-tracking branch 'origin/master' into design