Merge branch 'master' of https://github.com/JULIELab/jules-token-ae

Conflicts:
	README.md

git-svn-id: https://www.coling.uni-jena.de/svn/jules/trunk/jules-token-ae@8130 7ac257a9-6a28-0410-b245-f828558649ed
Merge branch 'master' of https://github.com/JULIELab/jules-token-ae