Merge dev to master, with LDAP working. v0.2.0
[markdown] Swapped from WYSIWYG to Markdown
[mailinglists] Buttons actually work to join/leave mailing lists. Except for hs, probably because of the dot is 'hs.team'.
Port old timetable importer
Merged teams branch (Still needs testing)
Merged timetable importer
Merge remote-tracking branch 'origin/markdown' into dev

Conflicts:
	requirements.txt
	settings.py
	urls.py
Added camp, finance and merch