Merge branch 'prefix-import'
SPARQLWrapper added as a dependency
RTD requires SPARQLWrapper dependency to also appear in requirements.txt
Merge branch 'master' into operation-controller

Conflicts:
	requirements.txt
Fix some bad automatic comment updates
Merge branch 'operation-controller'
Merge branch 'master' into httpstore

Conflicts:
	requirements.txt
Merge pull request #39 from oldm/httpstore

HTTP store
Merge branch 'master' into new-resource-manager

Conflicts:
	docs/oldman.rst