# Conflicts:
#	pom.xml
#	src/main/java/com/marketingconfort/mobiloca/constants/Message.java
#	src/main/java/com/marketingconfort/mobiloca/service/impl/ClientServiceImpl.java