FINI CALISS
Merge branch 'development' of https://github.com/Gladhus/cashsystem.git into development