Spamer - po jedne minute
Merge branch 'master' of git@github.com:novotnod/GJA.git

Conflicts:
	src/main/java/vutbr/fit/gja/business/service/ApplicationManager.java
	src/main/java/vutbr/fit/gja/business/service/impl/ApplicationManagerImpl.java