Nightmare governor: little adjustment and removed a parameter!
Merge remote-tracking branch 'upstream/master-jelly-cm-aokp' into master-jelly-cm-aokp
Different file between me and Yuri release!