Let's try this shit again..
Merge branch 'jellybean' of github.com:TeamPA/platform_manifest into jellybean