Add battery level around unlock ring [2/2]

Change-Id: Id594d7535aff99ab2712e8d6c9645330ca29e721

Conflicts:
	res/values/strings.xml
	res/xml/lock_screen_general.xml
	src/com/carbon/settings/fragments/lockscreen/LockscreenGeneral.java
Add HALO QS tile [2/2]

Change-Id: I02922690d596a2971641e12068c066ee592731ee
Active display: Allow apps to be excluded from being displayed [2/2]

Change-Id: Ieb6368c050f5b46eec7398ab0162dc4fbf00a392

Conflicts:
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java