commit us 2.2
Merge branch 'master' of https://github.com/tvillemo/genindex.git

Conflicts:
	src/InterfaceUS2_2.java
Merge branch 'master' of https://github.com/tvillemo/genindex.git