uncomment
yyuyuy
Merge branch 'master' of https://github.com/robipozzi/JafCommon

Conflicts:
	JafCommon/src/main/java/com/rp/jaf/config/Configuration.java