delete something
Merge remote-tracking branch 'origin/revert-4-myBranch' into myBranch

Conflicts:
	src/forms/customer/CustomerForm.java
Merge branch 'myBranch'