Merge branch 'master' into feature/unified-search (Upgrade Juzu 0.6.0-beta11) + change pom.xml version number for the branch

Conflicts:
	pom.xml