viewer version update
Merge branch 'master' into v2.4.0

Conflicts:
	build.properties