merging apptentive v1.6.5 into module
Merge commit 'ea34fa5da1a9766f1b2876129b2df3633a355005'

Conflicts:
	apptentive-android-sdk/res/values/strings.xml
	apptentive-android-sdk/res/values/strings_apptentive.xml
	apptentive-android-sdk/src/com/apptentive/android/sdk/Apptentive.java
	apptentive-android-sdk/src/com/apptentive/android/sdk/RatingModule.java
	apptentive-android-sdk/src/com/apptentive/android/sdk/SurveyModule.java
	apptentive/project.properties
	apptentive/res/values/strings.xml
	apptentive/src/com/apptentive/android/sdk/module/survey/OnSurveyQuestionAnsweredListener.java
	samples/apptentive-dev/.classpath
compile with android 19