bnm,
Merge remote-tracking branch 'origin/zhencopyjohn' into john_version_1

Conflicts:
	src/zhen/version1/framework/RunTimeInformation.java