Upda
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/entities/entities.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/entities/entities.js