Added filter functionality to inbox, messages can now be sorted according to buttons
Fixed linting
Merge branch 'master' of https://github.com/jarlefosen/INF5750-group-assignment
Merge branch 'master' into FH-27-cache-messages

Conflicts:
	www/js/controllers/InboxCtrl.js