importing wiki changes
Merge pull request #448 from caelum/syncSiteAndWikiContent

importing wiki changes