Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu
a
Merge branch 'master' into Wei_Lu

Conflicts:
	public/javascripts/index.js
Merge branch 'Wei_Lu'
Merge branch 'master' of https://github.com/luwei0917/Tractor-RPI-V2

Conflicts:
public/javascripts/game.core.js
jj

kk