Added filter functionality
Merge branch 'feature/Filterw.r.tTeam' into develop

Conflicts:
	NameReminder/ViewController.m