Some fucked up stuff.
Merge branch 'masterbranch' of https://github.com/lauri0/POS/ into masterbranch