add search_PHONE in personal data
Merge pull request #1 from TimingJL/master

add search_PHONE in personal data
add checkSimcard method to check SIMcard exist or not in PersonalData.java
add checkSimcard method to check SIMcard exist or not in PersonalData.java
add checkSimcard method to check SIMcard exist or not in PersonalData.java
add checkSimcard method to check SIMcard exist or not in PersonalData.java
remove redundant blank
repair the bug of sending short message to friends without check
Merge pull request #3 from TimingJL/master
Remove lost conflict label and snippet
test
separate 119 from 110
fixed the problem to get call of 119
add filter btn
finished new layout
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'
Merge branch 'master' of https://github.com/corn6028/iHelp-android into corn6028-master

Conflicts:
	app/src/edu/stu/db/CityAdapter.java
	app/src/edu/stu/ihelp/client/General.java
	app/src/edu/stu/tool/Locate.java
Merge branch 'corn6028-master'
add ToggleButton in layout