Battle Form
Merge branch 'master' of https://github.com/ShruikanTeam/eragon

Conflicts:
	TeamShruikan/EragonStructure/UI/BattleForm.Designer.cs
	TeamShruikan/EragonStructure/UI/BattleForm.resx