Merge pull request #1 from mozilla-b2g/master

Update
Nicer SIM PIN entry screen
Merge pull request #2 from mozilla-b2g/master

Head update