Added annotation count in homepage
Display note name in note.php
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	app/views/note.php