Merge pull request #2 from TeamCanjica/cm-11.0

duplicated, cm resources are in separated files
Add google location provider
Merge pull request #3 from TeamCanjica/cm-11.0

Add google location provider
Merge pull request #4 from Flo0008/cm-11.0

Update