update
Merge branch 'master' of https://github.com/trungptdhcn/SexPartner

Conflicts:
	.idea/libraries/libs.xml
	AndroidManifest.xml
	res/layout/first_partner.xml
	res/values/strings.xml
	src/com/example/SexPartner/activity/GetStartedActivity.java