First commit cm10.2 NexPerience
First commit part 2 cm10.2
Merge pull request #1 from Klozz/master

merge first commit into cm-10.2