Add delete of snippet
note style
Merge branch 'master' into alberto

Conflicts:
	app/assets/javascripts/controllers/noteCtrl.js
	app/assets/javascripts/views/noteOps.html
Fix error after merging
Conflict changes
Edited for minor fixes