merge before conflict
Merge branch 'master' of https://github.com/Isht/apotek
Merge branch 'master' of https://github.com/Isht/apotek
Merge branch 'master' of https://github.com/Isht/apotek
Merge branch 'master' of https://github.com/Isht/apotek
Merge branch 'master' of https://github.com/Isht/apotek
Fixing Master Item Layout