wrong var for conf
Merge branch 'master' of github.com:pscheit/psc-cms
Conflicts: lib/Psc/CMS/Project.php