Merge branch 'develop2' of https://students.kiv.zcu.cz:3443/git/aswi2017problem-solvers into develop2
Merge branch 'develop2' of https://students.kiv.zcu.cz:3443/git/aswi2017problem-solvers into develop2