fixed chpw
Merge branch 'master' into front-end-mockup-dev