commit
Merge branch 'master' of https://github.com/zhanglun/exercise

Conflicts:
	musicPlayer/index.html
	musicPlayer/static/build/scripts/mplayers.js
	musicPlayer/static/build/scripts/mplayers.min.js
	musicPlayer/static/src/common.js