Playing with filters
Added filter to AndroidController

Merge branch 'master' of github.com:pdilyard/tasklist

Conflicts:
	app/controllers/AndroidController.php