adding empty annis-admin project
more work on the Import GUI to actually use the new web service
merged develop branch
Consequently use of the ImportStatus interface in the kickstarter.
Merge remote-tracking branch 'korpling/annis/release/3.1.0' into develop

Conflicts:
	annis-service/src/main/java/annis/administration/AdministrationDao.java
Refactor the document browser. Use Jackson for parsing json configuration files
and data binding.
Inheritance works not with jackson.
Remove the DocumentBrowserConfig-cache, since it is stupid. It has to be cached
corpus wise.
Update documentation.
reintegrated master (with the 3.1.0 release) and updating version to 3.2.0-SNAPSHOT
avoid nullpointer exception if import status was not set (findbugs)
make field static
Finish annis-3.1.1

Conflicts:
	CHANGELOG
	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
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
remove the java platform hint
updating antlr
regenerated styles.css
Revert "regenerated styles.css"

This reverts commit 1582410237229cdefbae01dad62d59f859618e51.
make the SQL getter functions "STABLE" instead of "IMMUTABLE"
Revert "make the SQL getter functions "STABLE" instead of "IMMUTABLE""

This reverts commit 822ee1edb5b6101ef38e7c5bd7f0621303223dcd.