Merge origin/master

Conflicts:
	src/main/java/cz/cvut/kbss/wpa/back/LeagueListBean.java