Code cleanup
Update version for tag
Merge branch 'master' into dev-0.4

Conflicts:
	CHANGES.md
	extensions/Pagination.js
	package.json