temp
shake
Merge pull request #7 from wangbailin/master

temp
Merge pull request #8 from wangbailin/master

shake
polish
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	.gitignore
music
Merge pull request #9 from wangbailin/master

music
refine shake
refine shake
refine playing time for shake
polish
add china-v-pages as module
refine shake
图片压缩+底部文字大小适配
refine js for shake && set index -> static/pages/apppage/index.html
Merge pull request #10 from wangbailin/master

图片压缩+底部文字大小适配
refine for 4s
Merge branch 'master' of github.com:limijiaoyin/china-v
update submodule