p990: Updates for cm10.1

Change-Id: I794016296d819b1cf65d20a331b7a7602cbfa1b9
Merge cm-10 into cm-10.1

Conflicts:
	system.prop

Change-Id: I5c5882677f80c2b63a6ec220635fb4e328a30576
Switch kernel branches

Change-Id: I6ab20376ba720a3c6b2f4a6f96d64b52c5b8eb2a
from author pengus77, fixed battery charging screen