Merge pull request #2 from mrichart/master

change conf. parameters to the correct conf file
working on new pdp
Merge branch 'master' of github.com:xopxe/LuPA
working
Merge branch 'master', remote-tracking branch 'upstream/master'