Android Changes

Android Changes
Merge branch 'Android-Version'

Conflicts:
	file2.html