Add javadoc, update docs
Merge branch 'refactor' of https://github.com/apptentive/apptentive-documentation into refactor

Conflicts:
	using_apptentive/android/integration.md