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
use Apache Commons DBCP for connection pooling
cleanup
service now exposes its version and revision as REST call
the "ssl" parameter should not be set to false, but completly omitted if ssl is disabled
centralized how to get the version of ANNIS
show a warning in the GUI if the service version does not match
always close stream in VersionInfo
don't set the ssl parameter in intialization
workaround a change in the json library which now throws an exception whenever a mapping was not found instead of returning "null"
updating to Vaadin 7.2.5
Merged 'develop'.