2.4.0-dev
Add contributing guidelines
Merge branch 'QA_2_3'

Conflicts:
	CHANGELOG