Updated to new design
Merge branch 'master' into design1