Admin updates

admin updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.py
Merge branch 'master' of https://github.com/alcinnz/WyWeb