Admin updates / Frontend changes from Kelby & Catherine
Merge branch 'master' of https://github.com/thenhkid/icsciences