Merge remote-tracking branch 'origin/master'

# Conflicts:
#	service/src/test/java/cz/muni/fi/pa165/facade/TestMissionFacadeImpl.java
#	service/src/test/java/cz/muni/fi/pa165/service/TestMissionServiceImpl.java