Merge pull request #1 from AUTUpStageTeam/master

bring up to date with master
Merge pull request #111 from aki--aki/master

Fix log-in "remember me" not functioning completely as it should
Fix preview panel on media edit page move down on small screens
Merge remote-tracking branch 'upstream/master'
Fixed Issue 30

A SU user can now unlock a stage for editing
Merge branch 'master' of https://github.com/AUTUpStageTeam/UpStage2013
Changes to redirect code
Merge remote-tracking branch 'upstream/master'
Merge pull request #113 from dekpient/master

Fix issue 95 preview panel on media edit page
Removed links from non-user homepage

No longer able to see workshop link when not logged in. Also includes
some changes to redirection.
Fix page edit page navigation bar and layout issues
Merge pull request #114 from dekpient/master

Fix page edit page navigation bar and layout issues
User input validation when editing email and making new users
Merge pull request #115 from dekpient/master

User input validation when editing email and making new users
Merge branch 'pr/2'
Merging changes to main trunk into my fork

Conflicts:
	server/src/config/templates/stageedit.xhtml
Fixed issue #101

Renamed form natasha to form_mediaupload. removed multi frame drop down
box on props. code to change error message if you try to edit media to
have a name already in use (but currently nothing happens?)
Finalized removal of workshop link from guest home
Merge Lisa's fork into main trunk - remove workshop link from guest home page

Conflicts:
	server/src/config/players.xml
Fix small layout issue in media edit page
Add missing comment quotes