Merge remote-tracking branch 'upstream/master'
Front End: Singers Singer Albums Album
collect tab,singer,album
Merge pull request #3 from fuxing/master

前端：歌手索引 歌手 专辑谱列表 专辑谱
backend:upload images completed. Frontend: completed
Merge pull request #4 from fuxing/master

基本功能均已完成（歌手、专辑、谱子三个模块）
修正后台wiget模板报错的问题
Merge branch 'master' of github.com:bythink/byguitar
ignore some runtime files and mac files that useless
Merge pull request #1 from bythink/master

pull all