wiki conf
Merge pull request #424 from adlerm/master

wiki conf