interfaces
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/jet/set/actu/JetSetActu.java