Bury those beans

Change-Id: Id012dc441ff0bdce27f4778118990619a91e88d5
Merge branch 'kitkat' into xjparadroid
Update to version 2014-02-17

Change-Id: Ie339e6c0026768fc7beb0ecda6fdb31c96d3a67b
Revert "[2/3]Quiet Hours"

This reverts commit 8a202029be0b528c4d1b6499126e7743590bd552.

Change-Id: Iae74de61bdd252ed003eebb65727ff12f32de013
Merge "Revert "[2/3]Quiet Hours"" into kitkat
On-the-spot preferences

Allow for handling of resetting multiple preferences individually.

Present the user with a list of active on-the-spot preferences to
choose from.
If a preference dialog was never presented to the user, it will not
be available for reset.
If only one preference is currently active, a simple reset dialog is
presented (current existing dialog / no list)

PS1: Initial commit
PS2: Use defined strings instead of decoding the SETTINGS_TO_RESET variables.
     This allows for string translation.
     String names should be equivalent to the SETTINGS_TO_RESET variable.
PS3: Add some error checks

Change-Id: If9c483e0745000ab486f060bf87756204b4a8e6e
Merge branch 'kitkat' into xjparadroid

Conflicts:
	AndroidManifest.xml
	res/values/pa_arrays.xml

Change-Id: I3a31142c2981238a0172f42ed8b7618ac34efda1
Fix double end

Change-Id: Ibf4c5fcaa1948a32b275d68602e84a472a0921f8
Update version to 2013-03-03

Change-Id: I153d53dfb154b5728cad91da643795d8449ae43f
Update to version 2014-03-04

Change-Id: I169eb82e65529b78741a5f92aa1c6a52600fd67f
Merge branch 'kitkat' into xjparadroid