added survey
Merge branch 'master' of
https://github.com/ericwangtengyu/DataCollectionAndroid

Conflicts:
	smsRead/bin/jarlist.cache
	smsRead/src/androidMessages/MessageService.java
	smsRead/src/makeUser/MakeUser.java