Merge dev to master, with LDAP working. v0.2.0
[markdown] Swapped from WYSIWYG to Markdown
Merge branch 'markdown' into dev