Updated version
Updated version
Merge branch 'releaseCandidate' into lastRelease

Conflicts:
	Doxyfile
	build.xml
Fixed documentation
Merge branch 'releaseCandidate' into lastRelease

Conflicts:
	build.xml
	scripts/Doxyfile.template
Updated version