filter changes


Change-Id: I71032e2b67b9b42274126ed3e875b6c3cd83471e
Merge branch 'master' of
ssh://git@github.com/dtyndall/CelebrationApp.git

Conflicts:
	CelebrationApp/src/com/example/celebrationapp/TabbedSchedule.java

Change-Id: If9027aec27416badbb843c761a5e87c16465aa30