commit changes before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/lib/src/main/java/com/github/podd/utils/SparqlQueryHelper.java
	webapp/lib/src/test/java/com/github/podd/ontology/test/SparqlQueryTest.java