Merge remote-tracking branch 'origin/jb-mr1-mod' into jb-mr1-mod2

Conflicts:
	res/layout/voltage_dialog.xml
	src/com/aokp/romcontrol/fragments/performance/CPUSettings.java
	src/com/aokp/romcontrol/fragments/performance/VoltageControlSettings.java
	src/com/aokp/romcontrol/service/BootService.java