add filter btn
Merge branch 'master' of https://github.com/TimingJL/iHelp-android into TimingJL-master

Conflicts:
	app/src/edu/stu/ihelp/client/PersonalData.java
Merge branch 'TimingJL-master'