Changelog updated, version changed
Merge branch 'master' into milestone

Conflicts:
	package.json