Annotation Compatablility and note links

-made annotations compatible with new text editor
-make links in homepage link to '/{noteId}'
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	app/views/record.php