Added clean targeti / Encoding difference
Added clean targeti / Encoding difference
Java 7 Updates
Also delete JAR file
updates for new Java versions
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/cchmc/jndi/XMLContext.java
Merge with CCHMC repo