Merge remote-tracking branch 'origin/master' into TextPro

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