The delete button on note screen

The delete button is redisplayed when editing / making new note
Pulling from calvin/wangs code
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0
Able to delete note from listview and note screen

unable to redisplay yet from listview menu!
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	AndroidManifest.xml