Merge branch 'master' into db-hibernate2

Conflicts:
	Server/build.gradle
	Server/src/main/java/cz/cuni/mff/ufal/textan/server/configs/AppConfig.java