Merging changes from https://github.com/aruder77/Openbravo-POS-iPhone-App/tree/master/UnicentaPOS