Added and fixed show deleted functionality
Merge branch 'master' of https://github.com/charlesivie/eeplanner
Merge branch 'master' of https://github.com/charlesivie/eeplanner
Merge branch 'master' of https://github.com/charlesivie/eeplanner
Commit

Conflicts:
	src/main/java/com/eeplanner/dao/StaffRepository.java