Update changelog for 0.5.5 version bump
Merge branch 'master' into develop

Conflicts:
	README.rst