Updates
Merge branch 'master' of https://github.com/Gamersab/local_manifest-cm12

Conflicts:
	local_manifest.xml~

Updates