set final versions to 3.5
Merge branch 'jacalvo/3.5-final'

Conflicts:
	main/core/ChangeLog
	main/webserver/debian/control