Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android into cm-11.0-manifest

Conflicts:
	default.xml