Finish annis-3.1.6
Merge pull request #337 from larilampen/develop

Trivial fix for issue #336
Merge pull request #341 from adrianeboyd/develop

#332 Improving document metadata cache in document browser table
Merge pull request #340 from korpling/CorefVisualizer

fixed bug in CorefVisualizer. The annotation name is now displayed
updated licenses
updating version
updated changelog
Finish annis-3.1.7
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	Misc/changelog.py
	annis-gui/pom.xml
	annis-gui/src/main/java/annis/gui/docbrowser/DocBrowserTable.java
	annis-interfaces/pom.xml
	annis-kickstarter/pom.xml
	annis-libgui/pom.xml
	annis-service/pom.xml
	annis-service/src/main/java/annis/dao/SpringAnnisDao.java
	annis-visualizers/pom.xml
	annis-widgets/pom.xml
	buildbot_scripts/copyService.sh
	doc/Doxyfile
	pom.xml