started delete button
Merge branch 'delete-button' into shashtin.development

Conflicts:
	js/app.js
Merge branch 'shashtin.development' of github.com:devleague/gee-mail-plus into shashtin.development

Conflicts:
	js/app.js