Merge branch 'content' of git://github.com/vingtetun/gaia into haida-sms-sheets
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-gallery-sheets
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-gallery-sheets
Adding in-content navigation.
Currently not differenciating apps from web content.
Let's see if we can keep it like this :)
Merge pull request #43 from etiennesegonzac/in-content-navigation

Adding in-content navigation.
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-gallery-sheets
Merge pull request #44 from samjoch/content-settings

Settings
Make the homescreen out of the flow
Merge branch 'content' of github.com:vingtetun/gaia into HEAD
Merge pull request #45 from samjoch/content-settings

fix settings nav
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-gallery-sheets
Sheets support for gallery
Merge pull request #46 from michalbe/haida-gallery-sheets

Haida gallery sheets
settings phone lock & passcode
cleanup
settings informations