Merge pull request #1 from VlikeBanana/4.4

Add missing Settings parts and fixes
Merge pull request #2 from VlikeBanana/4.4

Add Illusion Version into Settings
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml