User permission levels
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/src/config/players.xml
	server/src/config/templates/editplayer.xhtml
	server/src/html/script/user.js
	server/src/upstage/pages.py
	server/src/upstage/player.py
Fix stage lock function (#134)
Merge upstream and add comments
Merge pull request #169 from LisaHelm/master

Fix for stage lock (#134) and clarify user user permissions (#88)