Merge branch 'mergeQueryService'

Merge the QueryService into the storage service. This allows the query service
to directly access the virtuoso model instead of using the NepomukMainModel
which uses a local socket to communicate with the model in the storage
service.

Results in a big performance boost for queries using the QueryServiceClient