Merge pull request #63 from samjoch/content-settings

disabled lockscreen
entry point fix in comms app
Merge pull request #64 from michalbe/haida-content

entry point fix in comms app
Make the home app comes from the right again
sheet duplication restored
Brining back a way to close the rocket bar without going somewhere else
(by taping the empty result list).
Fixing the z-index issue for the progress.
Merge pull request #65 from etiennesegonzac/rocket-bar-hide-fix

Brining back a way to close the rocket bar without going somewhere else
merge conflict
Implementing a sane and more performant way to handle the status bar.
Merge pull request #67 from etiennesegonzac/cleaner-statusbar-handling

Implementing a sane and more performant way to handle the status bar.
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-content
mc
Merge pull request #66 from michalbe/haida-content

sheet duplication restored
Caching the screenshots.
The current invalidation heuristic is to throw the screenshot away if
the sheet is displayed for more than 1.5sec.
Merge pull request #68 from etiennesegonzac/screenshot-caching

Caching the screenshots.
cleaning
Merge pull request #69 from michalbe/haida-content

cleaning
sms links in new sheet
Make error handling more robust
Merge branch 'content' of github.com:vingtetun/gaia into HEAD