User view (half state)
Merge branch 'master' of github.com:ferjm/firefoxos-dogfood
User view