cLock: Latest merges

Change-Id: I15962a537fd89f27f2a3be773d80515b960f8824
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_LockClock into cm-10.1