Tidy up usings and typedefs
Merge branch 'dev' of https://github.com/M4GiK/prir-laboratories into dev