coded Context
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/intellimate/izou/addon/AddOnManager.java
Merge remote-tracking branch 'origin/master' into log4j

Conflicts:
	src/main/java/intellimate/izou/addon/AddOn.java
almost finished log4j init and recieved context
almost finished log4j init and recieved context