typo fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/nineeyes/wargrid/field/StandardGridFactory.java
typo fix