Added confirmation of delete.
Added cansel button.
Fixed conflict.
Merge remote-tracking branch 'origin/develop' into develop