Check in addIntegration() API and Urban Airship keys. Update README, etc.
Merge branch 'master' into ua_integration

Conflicts:
	CHANGELOG.md
Get interaction fetching working.
Add new code point storage code, fill out a bit more of the interaction mechanism, loading, and saving.
Auto Link the Thank You Dialog shown at the end of surveys.
Check in complete push notification changes including Urban Airship integration.
Change method name, update readme, changelog, apichanges.
Add java syntax highlighting to part of readme.
Add comment to ActivityLifecycleManager explaining the problem with Push Notifications.
Change how we prevent a push notification from being handled over and over. Have the developer pass us the intent and save our extra data in SharedPreferences. Then, when they call us, retrieve and clear this data before using it.
Update javadoc and README for new push behavior.
Merge branch 'master' into ua_integration

Conflicts:
	CHANGELOG.md
	apptentive-android-sdk/src/com/apptentive/android/sdk/util/Constants.java
Merge branch 'master' into ua_integration
Update changelog.
Merge branch 'master' into engagement
Merge branch 'master' into ua_integration

Conflicts:
	CHANGELOG.md
Bump to 1.2.5
Merge branch 'master' into engagement
Add interactions endpoint.
Use build in addition to version. Redo code point storage.