Update the description about views on the Readme
Update version
Update version
Merge branch 'master' into local-builder

Conflicts:
	src/build.xml