HP changes
Merge branch 'master' of https://github.com/bnjmnpn/muan.github.com

merge design changes