Merge pull request #34 from stevotdo/jellybean

fix conflicting browser plugins
bt audio/calls

Change-Id: Ie190860e8d12d45c76793c2a2321a3f4eb9dca2d
Merge pull request #1 from jied83/jellybean

Jellybean