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

Conflicts:
	os2web_taxon_api.make
Taxon taxonomy module moved to own repo without OS2web.
Merge branch 'hotfix-1.0.1' into develop