tttteeeesttting
Merge remote-tracking branch 'origin/kitkat' into kitkat

Conflicts:
	res/layout/preferences.xml
	res/values/styles.xml