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

Fix THE problem
Change all names to lowercase
A little bit of styling
Merge pull request #172 from dekpient/master

Little things
Remove or move unused assets
Ant 'stop' target is back YAY! and the scary 'kill' target is gone
Default 'test' stage and every media belongs to the user created using `upstage-admin create`
Update folder structure and use `mtasc` and `swfmill` to compile client in install.py