Merge pull request #49 from linuxman94/privacyguard

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