Add information about this repository
Merge branch 'master' into devel

Conflicts:
	README.md