refactoring some names and adding last test
Merge remote-tracking branch 'origin/master'

Conflicts:
	DnDTroopsProject/derby.log