Added DefaultPromptSpinner
Merge remote-tracking branch 'origin/master'

Conflicts:
	oak-demos/AndroidManifest.xml
Added DefaultPromptSpinner merge fix