update
Merge branch 'master' of https://github.com/palmnet/taskplayer

Conflicts:
	taskplayer/html/index.html
	taskplayer/html/js/common.js