added methods
added classes and methods
asd
implements Serializable interface
Merge branch 'version_1' into zhencopyjohn

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

Conflicts:
	src/zhen/version1/test/TaintedEventGeneration.java