spinner
Merge remote-tracking branch 'origin/issue143' into issue8

Conflicts:
	res/values/styles.xml