query zusammengebastelt
Merge branch 'master' of https://github.com/Saijin/faolrd into Saijin-master

Conflicts:
	src/main/java/org/faolrd/LanguageDetection.java
Merge branch 'master' of https://github.com/Saijin/faolrd into Saijin-master

Conflicts:
	src/main/java/org/faolrd/LanguageDetection.java