Merge branch 'master' of /Users/ljl/Workspace/wem-ce with conflicts.
CMS-1681 Create WizardPanel