Merge pull request #858 from leider/master

wiki integrated into SoCraTes