Merge dev to master, with LDAP working. v0.2.0
Merge branch 'master' of github.com:csesoc/csesoc-website-v2