minor
Merge branch 'master' of https://github.com/AKSW/SPARQL2NL

Conflicts:
	src/main/java/org/aksw/assessment/question/SimpleQuestionGenerator.java