Made start for new fight function
Made new battle system work
Merge branch 'new_battle' into icons

Conflicts:
	js/entities/army.js
	js/entities/buttons/building.js