Lets see if I get my old modifications on the DataSource object working...
Merge branch 'master' of git://github.com/Aklakan/pubby

Conflicts:
	.gitignore
	pom.xml
	src/main/java/de/fuberlin/wiwiss/pubby/Dataset.java