added new config methods
added new config methods
Merge branch 'deep-refactor-different' of github.com:Stratio/stratio-deep into deep-refactor-different

Conflicts:
	deep-commons/src/main/java/com/stratio/deep/config/ConfigFactory.java