Upate strings to remove a few duplicates.
Merge branch 'master' into ent_surveys

Conflicts:
	apptentive-android-sdk/res/values/strings.xml
Merge branch 'ent_surveys' into dialog_surveys