MERGE: Merge ICS
FIX: NumberPicker for led settings - why won't my classes work?
FIX: Led settings - got to add the lights
FIX: Not creating all the table columns
Initial Commit for 4.3_r2.1
Merge branch 'r4' of github.com:DroidJunk/droidjunk_packages_apps_Email into v4.3_r2.1

Conflicts:
	src/com/android/email/NotificationController.java
FIX: Was showing DEFAULT_LIGHTS instead of custom