Merge branch 'jellybean-dev' into jellybean

Merge branch 'hybrid-dev' into hybrid

Update version to 2.1.1

(included updates do NOT effect any of our supported devices,
will not be pushing this update publically).

Merge branch 'gingerbread-dev' into gingerbread for v2.1

Merge branch 'hybrid-dev' into hybrid for v2.1

Merge branch 'jellybean-dev' into jellybean (missed 4.2 fixes in prev…

…ious merge).

2.0.1

version 2.0.2

2.0.2

Version 2.0.1 (for real this time)