Merge branch 'temp'

Conflicts:
	src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java

diff --cc src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index 0c9fc6f,4585fc0..fc23ae2
--- 1/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
--- 2/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@@ -86,8 -86,8 +86,8 @@@ public class Pz2Config implements Modul
    }\r
  \r
    @Override\r
--  public String getConfigFilePath() {\r
 -    return ""; // moduleConfig.getConfigFilePath();\r
++  public String getConfigFilePath() {
 +    return (moduleConfig != null ? moduleConfig.getConfigFilePath() : "nopath");\r
    }\r
    \r
    \r