Nightmare gov: added some new parmaters and sorted out!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/customconfig/battery.profile
	res/customconfig/customconfig.xml
	res/customconfig/default.profile
	res/customconfig/extreme_battery.profile
	res/customconfig/extreme_performance.profile
	res/customconfig/performance.profile