Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of
ssh://git@github.com/gregorybesson/AdfabPartnership.git