remove gov_tweaks script along with cpu_settings script if set on boot is unchecked
Merge remote-tracking branch 'origin/master'

Conflicts:
	CpuControlFragment.java