add delete modal;
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/get_roles.html
add delete modal;
add delete modal;