last small bugs fixed
Merge branch 'master' of https://github.com/pnic/Bachelor