Removed annotation test
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	app/controllers/NoteController.php
	public/js/main.js