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
Merge pull request #167 from dekpient/master

Various fixes and improvements related to layout and UX
Added warning message

Added a message in the footer saying that we support the latest versions
of the browsers we support and changed the version number from 2.5 to
3.0 BETA
Merge pull request #168 from VanessaHenderson/master

Added warning message
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)
Set up default users, renamed rupert,, made usernames case insensitive
Multiword tags

When adding a tag with spaces the spaces are replaced with under scores
Should not be commented out
Fix THAT problem
Merge remote-tracking branch 'upstream/master'