Updated changelog
Merge branch 'master' into stable

Conflicts:
	CHANGELOG.md
Corrected submit ready message
Updated changelog
Merge branch 'stable'