bug fixing
Merge branch 'master' of https://github.com/wulifu2hao/CS3213VisualIDEnew

Conflicts:
	app/scripts/views/player.js