minor local changes
Merge branch 'master' of https://github.com/samthiriot/genlab

Conflicts:
	genlab.igraph/META-INF/MANIFEST.MF
	genlab.igraph/build.properties