RC: Suspend actions (2/2) - Squashed

Change-Id: Ib29271bad0698b8d1ac70ac5a4d28d7da7b4c720
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	res/values/strings.xml
	res/xml/preference_headers.xml
	src/com/aokp/romcontrol/CreateShortcut.java
RC: Wakelock blocker (2/2) - Squashed

Change-Id: Ie319d6db8032c42238b3576828c2e0970a52812d
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	res/values/strings.xml
	res/xml/preference_headers.xml
	src/com/aokp/romcontrol/CreateShortcut.java
Merge branch 'jb-mr2' of https://github.com/TeamHorizon/packages_apps_ROMSettings into jb-mr2

Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	AndroidManifest.xml

Change-Id: I57f3ea373e5bff0bce98793e1f3d55d397476296