Finish annis-3.1.1
updating to next hotfix release version
fix #309
ensure that a token always has it's own token index as left_token and right_token value (and not the one of another overlapping token)
also update version in documentation and buildbot
updating changelog
Finish annis-3.1.2

Conflicts:
	Misc/changelog.py
	annis-gui/pom.xml
	annis-interfaces/pom.xml
	annis-kickstarter/pom.xml
	annis-libgui/pom.xml
	annis-service/pom.xml
	annis-visualizers/pom.xml
	annis-widgets/pom.xml
	buildbot_scripts/copyService.sh
	doc/Doxyfile
	pom.xml
Merged 'develop'.
use the ".relannis" suffix
adjusted tests to the new node IDs and layer names