[Change]添加单模块配置
Merge branch 'master' of https://github.com/xspider/webapps-demo

Conflicts:
	music/config/fis-config.xml
[Change]添加歌手列表
[Change]添加歌手详情
Merge branch 'master' of https://github.com/xspider/webapps-demo

Conflicts:
	music/config/fis-config.xml
Merge pull request #1 from walterShen/master

添加singer和singerDetail