Spinner.java changed
Merge remote-tracking branch 'remotes/origin/changed_file'

Conflicts:
	Spinner.java