no message
no message
no message
no message
Merge branch 'hotfix' into develop
Merge branch 'feature1' into develop
Merge branch 'feature2' into develop

Conflicts:
	README.md
no message