merge with master
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
fix icon height and width
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu