Merge remote-tracking branch 'upstream/master-jelly-cm-aokp' into master-jelly-cm-aokp
Merge branch 'master-jelly-cm-aokp' of github.com:Alucard24/Dorimanx-SG2-I9100-Kernel into master-jelly-cm-aokp
Nightmare and Darkness update: fixed some things!