cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/BusinessController/PlayerLogicManager.js