add music download and play function
fix conflict
Merge branch 'develop' of https://github.com/liangxiaofei1100/ChengYuDaHui into develop