Merge branch 'develop'
Dont use git protocol
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	os2web_contact.make
Merge branch 'develop'
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Move link in contact text.
Merge branch 'hotfix-1.0.1' into develop