Merge branch 'Pexi-edit2'
Merge branch 'master' of https://github.com/Pexi1991/Mobiiliasiakassovellus-