Area, combat unit, resources, updating faction, player
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	game/Player.js