Merge branch 'feature' of https://github.com/loranazarenko/iMedic into feature