Nouvelles priorités
Merge branch 'master' of https://github.com/Aluriak/Hubosans4

Conflicts:
	TODO.mkd
Merge