reeditted some constants
Merge remote-tracking branch 'origin/master'

Conflicts:
	managers/entityManager.js