Fixed indentation to tabs from spaces for consistency
Fixed bug where filtering was not being done correctly
Merge remote-tracking branch 'phpma/master' into fixes

Conflicts:
	app/webroot/js/custom.js
Merge pull request #15 from m0hamed/fixes

Fixes bugs that arised from previous pull request