Camera widget toggle

Squashed commit of the following:

commit 4529fa38bcbb81ed3d404f87eb1834176c18762b
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Sun Jan 20 16:15:50 2013 -0500

    fixes to camera widget on lockscreen

    Change-Id: Ie0af8d003a53e8fe04577762640b4ac16997b835

commit aaad28cb8cd9210d3dda4d59b0553813db9f4e14
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Sun Jan 20 01:17:33 2013 -0500

    add preference to disable low battery warning!

    Change-Id: If723a61069803df9511ddb976d35c6ef3a345dc7

commit 2e68b2233e746d72be9866f8b6a8072bc4b4ed28
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Sun Jan 20 00:31:06 2013 -0500

    add toggle to remove camera widget from lockscreen

    Change-Id: I15a703f899e9eaec027fca5a667c73ac08d2d489

Change-Id: Ice15f8da6f950a99906075aca58157cf97d6794c

Conflicts:

	core/java/android/provider/Settings.java
fixing conflictoes