First steps for object generator
Merge remote-tracking branch 'github/master' into master-github

Conflicts:
	instrumentor/src/acteve/instrumentor/InstrumentationHelper.java