kl
as
Merge remote-tracking branch 'origin/john_version_1' into zhencopyjohn

Conflicts:
	src/zhen/version1/test/SampleTestClass.java
	src/zhen/version1/test/TaintedEventGeneration.java
update
added API
Merge remote-tracking branch 'origin/zhencopyjohn' into john_version_1
asdfasdf