master
develop 2
Merge branch 'master' into develop

Conflicts:
	README.md
Merge branch 'develop'