Merge pull request #2 from fsiaonma/master

UI 修改
Merge pull request #3 from fsiaonma/master

提交 20130711
need UI modification
Merge pull request #4 from fsiaonma/master

目录结构整理
modify the file structure
Merge pull request #3 from TingoZhou/master

同步