Settings page
Merge
Merge branch 'master' of https://github.com/wujigrid/xin.git