Merge branch 'android-4.4' into Kitkat

Conflicts:
	default.xml