Merge pull request #51 from alfeko/master

Updated with master
Fixed delete customer
Fixed merge bugs