Remove conflicts
Merge branch 'dev/master' of https://github.com/maksymcierzniak/worktime into dev/master