Fix main features
Merge remote-tracking branch 'origin/Back-End' into Back-End

Conflicts:
	app/controllers/HomeController.php
	app/controllers/NoteController.php