Update version
Update Changes
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Changes
Bump version number