Finish annis-3.1.2
remove the java platform hint
updating antlr
regenerated styles.css
Revert "regenerated styles.css"

This reverts commit 1582410237229cdefbae01dad62d59f859618e51.
properly escape all "invalid" characters in corpus names when creating empty corpus.properties

(fixes #310 #312)
updating version to 3.1.3 (next bugfix release)
fix some documentation issues (fixes #313)
make the SQL getter functions "STABLE" instead of "IMMUTABLE"
make the SQL getter functions "STABLE" instead of "IMMUTABLE"
avoid joining the corpus table in "find"
Revert "make the SQL getter functions "STABLE" instead of "IMMUTABLE""

This reverts commit 6c7ebcfed18410f0c3f80773c33a71e635dfa93e.
Revert "make the SQL getter functions "STABLE" instead of "IMMUTABLE""

This reverts commit 822ee1edb5b6101ef38e7c5bd7f0621303223dcd.
workaround applied to frequency in order to fix #314
typo in documentation
updating changelog
Finish annis-3.1.3
Finish annis-3.1.3

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
updating to vaadin 7.1.14
adding the foundation for "annotext" mode