Merge pull request #37 from linuxman94/privacyguard

CM Privacy Guard (1/2)
Merge remote-tracking branch 'github/jellybean' into jellybean