Fixed Issue #26

Changed "Revert Changes" button to "Cancel" and changed their order
Merge branch 'master' of https://github.com/AUTUpStageTeam/UpStage2013