US8 = batch, liste echnatillon, etc
Merge branch 'master' of https://github.com/tvillemo/genindex

Conflicts:
	src/Database.java
	src/Main.java
seg
Merge branch 'master' of https://github.com/tvillemo/genindex