minor
default hash
Merge branch 'hash2pidSet' into public

Conflicts:
	GAE-Tools/src/com/silverwzw/gae/tools/pad_emulator/PadEmulatorSettings.java