transferred the cancel to the admin
for the cancel function
for merging purposes
conflicted...merging
Conflicts:
	db_script/application.sql
	javascript/globs.js
	javascript/globs.js~
	scripts/deleteentry.py
	scripts/delperapp.py~
	scripts/header.py
for merging conflicts