Started working on 1.6 compatibility.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dsh105/holoapi/protocol/InjectionManager.java
Fixed merge error.