Merge branch 'master' of https://students.kiv.zcu.cz:3443/git/aswi2016-nulla-dies-sine-linea-search-frontend
Merge branch 'master' of https://students.kiv.zcu.cz:3443/git/aswi2016-nulla-dies-sine-linea-search-frontend