improve
Merge branch 'master' of https://github.com/raulcsj/CPF.git

Conflicts:
	util/src/main/java/common/util/EncryptorUtil.java