Merge from dev-yvonne
merge from yvonne
fixed: only players with result will trigger result function.Merge branch 'feature/dev-tang' into feature/dev-yuyu

Conflicts:
	app.js
	public/js/main.js
	views/index.jade