Merge branch 'master' of https://bitbucket.org/appfusions/universal-wiki-converter