grlc

Merge remote-tracking branch 'origin/DEM-78_Bug_fixes' into DEM-108_Bug_fixes

# Conflicts:
#	.gitignore
#	src/__version__.py
#	src/fileLoaders.py
#	src/gquery.py
#	src/grlc-server
#	src/prov.py
#	src/server.py
#	src/sparql.py
#	src/swagger.py
#	src/utils.py
#	tests/mock_data.py
#	tests/test_endpoints.py
#	tests/test_gquery.py
#	tests/test_loaders.py
#	tests/test_swagger.py
#	tests/test_utils.py