Some old changes which might break something .... ?
Merge branch 'master' of github.com:AKSW/Sparqlify

Conflicts:
	sparqlify-core/src/main/java/org/aksw/sparqlify/sparqlview/SparqlViewMain.java
	sparqlify-core/src/test/java/org/aksw/sparqlify/core/test/R2rmlTest.java