near final changes
Merge branch 'master' of https://github.com/gwolfe/Drow into gwolfe-master

Conflicts:
	src/drow/io/DrowIOActionManager.java
Merge branch 'gwolfe-master'
Fixed java dictionary