bug fix to not load markdown.php if loaded elsewhere
Merge branch 'refs/heads/develop'