correct Customer.java
Merge branch 'develop' into test