Merge branch 'master' of https://bitbucket.org/mobilitasistemas/hcm

Conflicts:
	src/main/java/br/com/mobilitasistemas/hcm/model/service/ApplicationConfig.java