修复导航
新增iScroll
Merge branch 'master' of https://github.com/xspider/webapps-demo

Conflicts:
	music/config/fis-config.xml