adding delete buttons
Merge branch 'master' of https://github.com/yaslisari/Aptana

Conflicts:
	template.html
adding delete
Merge branch 'master' of https://github.com/yaslisari/Aptana
Merge branch 'master' of https://github.com/yaslisari/Aptana