redesign1

Battle changes
Battle system finished
Merge branch 'battle-redesign'