Change to new taxonomy machinename for site structure
Updated machinenames for vocabularies
Dont use git protocol
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	os2web_spotbox.make
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Merge branch 'develop'
Add caching on views. Also add Editor to permission.
Merge branch 'hotfix/views-caching' into develop