add jlani
Merge branch 'master' of https://github.com/jnphilipp/faolrd
Merge branch 'master' of https://github.com/proewer/faolrd into proewer-master

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