Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/bo/acredito/domain/Address.java
	src/main/java/com/bo/acredito/domain/Customer.java
	src/main/java/com/bo/acredito/domain/Occupation.java
	src/main/resources/META-INF/persistence.xml