Sundry updates
Merge branch 'master' of https://github.com/FireSBurnsmuP/lms-web

Conflicts:
	web/prototypes.html