Merge remote-tracking branch 'origin/master'
acteve/instrumentor/Annotation.java
	instrumentor/src/acteve/instrumentor/Config.java
	instrumentor/src/acteve/instrumentor/G.java
	instrumentor/src/acteve/instrumentor/InputMethodsHandler.java
	instrumentor/src/acteve/instrumentor/Instrumentor.java
	instrumentor/src/acteve/instrumentor/Main.java
	instrumentor/src/acteve/instrumentor/ModelMethodsHandler.java
	instrumentor/src/acteve/instrumentor/Printer.java
	instrumentor/src/acteve/instrumentor/SymOpsClassGenerator.java

Conflicts:
	instrumentor/src/acteve/instrumentor/InstrumentationHelper.java
	instrumentor/src/acteve/instrumentor/Main.java
	instrumentor/src/soot/jimple/infoflow/entryPointCreators/CBaseEntryPointCreator.java