Merge pull request #51 from alfeko/master

Updated with master
Fixed delete customer
Fixed merge bugs
Fixed merge bugs
Merge pull request #63 from alfeko/master

Updating with master