rebuild customer 7
Merge branch 'master' into Sunday

Conflicts:
	src/forms/customer/CustomerForm.java
	src/forms/customer/CustomerForm.jfd