Kangedpicked commits from cyanogenmod review part 1#

Almost cherry-picked everything from Oliver at this review link
I am bad with the GIT functionality so I screwed it every time.

SO, KANG TIME (and kang means I added almost everything manually without keeping the commits from oliver :( )

Thanks to OliverG96

http://review.cyanogenmod.org/#/c/52032/