Initial changes for jellybean-release
Merge pull request #1 from Varcain/jellybean_experimental

Initial changes for jellybean-release