added sword & armor values
Merged bartwe's changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ardust/server/Dwarves.java