Deleted temp file created by FileMerge
No meaningful comment to add at this moment.
Added PaperStatusDA. Paper statuses no longer hard coded in Admin view.
Conflicts in DataAccessFacade.java resolved