Merge branch 'dev'
cleaned up labs page
wording tweak
renamed wiki to wizi
wording tweak
added wiki directory
wiki display is working
fixed event-link bug
updated internal AAR
wiki editing works
updated report calculation
fixed bug that prevented admin from changing member passwords