These are the changed necessary in order to move to asm4
Merge branch 'moveToAsm4'

Conflicts:
	hk2/pom.xml