Bulk Changes from GearCM
Merge remote-tracking branch 'origin/cm-11.0' into cm-11.0

Conflicts:
	configs/media_profiles.xml