a
Merge branch 'master' of github.com:774663576/Interestfriend

Conflicts:
	bin/InterestFriend.apk
	bin/classes.dex
	bin/classes/com/interestfriend/activity/WelcomActivity.class
	bin/dexedLibs/datetimepicker-library-878724e745de56fd558cf0ace859188f.jar
	bin/dexedLibs/promptdialog-master-c060475d25105636ff89e7a4fcc7bffe.jar
	bin/resources.ap_
	src/com/interestfriend/activity/WelcomActivity.java
tab