Merge branch 'master' of https://github.com/LinDA-tools/r2r-designer

Conflicts:
	README.md
Merge branch 'master' of https://github.com/LinDA-tools/r2r-designer

Conflicts:
	README.md