Merge pull request #3 from AUTUpStageTeam/master

Merging in latest changes to main trunk
work done 1/10/2013
Unassigning media from stageeditpage can now be discarded
Fix "cancel" on stage edit page should revert all changes

Fixes https://github.com/AUTUpStageTeam/UpStage2013/issues/91 - also
changed the way the preview/unassign media from stage edit page
functions - now media is not unassigned and player access levels are not
changed until stage is saved. Still has some issues: - cancel button
only works once to clear the select boxes, and unsaved changes to select
boxes are not dropped when user navigates away from page.
Fixed media/user access change discarding on stage edit page
Fix for #128
Merge branch 'master' of https://github.com/LisaHelm/UpStage2013

Conflicts:
	client/src/application.xml
	server/src/upstage/pages.py
	server/src/upstage/stage.py
Revert "Merge branch 'master' of https://github.com/LisaHelm/UpStage2013"

This reverts commit f8783d57c006c0cf91638f45f1f1a7dc8c2c4964, reversing
changes made to 800886c07bccf2f09015afef3f349c6b30099977.
More on issue #94

Search by string now includes tags on top of name and stream name
Revert "Fix for #128"

This reverts commit 47bff6ea22dfc66092d34f5646f0118e985236e4.
fix for #128 plus improvements to stage edit page
Merge with upstream
Merge pull request #152 from LisaHelm/master

Fix issues #128, #126, #91, #21