Battle "finished"

finished battle but need to add more commands and skills to make it more
fun.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Engine/Engine/Engine.vcxproj.filters