A little Own-ifying

Change-Id: I87328236f513544be334e0170b0e155991eca887
Added OwnROM logo V2 to About Phone

Change-Id: I7e4901f1d036193e7af1b56bed21fb1dd6a95181
Merge remote-tracking branch 'origin/cm-12.0' into cm-12.0
Merge remote-tracking branch 'origin/cm-12.0' into cm-12.0
Merge remote-tracking branch 'origin/cm-12.0' into cm-12.0
Merge remote-tracking branch 'origin/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
New OwnROM Logo
by @brakke97

Change-Id: I428501ced5f127ece7f115a67442397fcf2c2b68
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
long press back to kill configurable timeout (2/2)

	by: @cristianomatos

Change-Id: If5254d0e2f9d7c071b097c7c5f586ce8d698675f
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0
Adding new Settings
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0

Conflicts:
	res/xml/development_prefs.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DevelopmentSettings.java