Added JUnit test for the game context parser
Added fight log function to the Fight form
Modified fight engine
Modified console app
Modified fight engine
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	DRPGApp/pom.xml
merged master into test