Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	res/xml/quick_settings_panel.xml
	src/com/android/settings/quicksettings/QuickSettings.java
Settings: Comment out Google's bug report

This really feels out of place and does not serve a purpose in OmniROM or any custom ROM really.
On top of that, I doubt Google would seriously take into consideration a bug report off a custom
ROM.

I also think it confuses your average user when they try to submit a report via that option and
nothing happens....

Change-Id: I0f9997f425752080074980c32efd825530c353ed
PIE from ParanoidAndroid [2/2]