Bug 811528 - pref native identity on
Bug 825374 - [email] UI regression on compose card; address input boxes cut off text, appear to resize based on amount of text typed in them.

Also includes a fix for the lack of a comma key with type=email
https://bugzilla.mozilla.org/show_bug.cgi?id=825812
Bug 825862 - Add loading overlay to sim import during FTU.

Updated: Now disables the navbar during import.
Merge pull request #7272 from KevinGrandon/bug_825862_sim_import

Bug 825862 - Add loading overlay to sim import during FTU.r=julienw
Merge pull request #7252 from asutherland/fix-compose-css-regression

Bug 825374 - [email] UI regression on compose card; address input boxes cut off text, appear to resize based on amount of text typed in them. r=schung, a=blocking-basecamp
[Bug 821248][SMS] Message (SMS) app doesn't use contact names
Merge pull request #7268 from borjasalguero/bug_contacts_sms

[Bug 821248][SMS] Message (SMS) app doesn't use contact names 
Bug #825293 reorganized number of nodes & currentDisplayed comparision r=timdream

indent fix
Merge pull request #7286 from michalbe/non-selectable-card

Bug #825293 reorganized number of nodes & currentDisplayed comparision, r=timdream, a=blocking-basecamp
Bug 826177 - Vibrate every 2 secs as long as a call is waiting.
r=alive
Merge pull request #7289 from etiennesegonzac/bug-826177-call-waiting-notification

Bug 826177 - Vibrate every 2 secs as long as a call is waiting.
Bug 826354 - Don't show cards view when screen is locked
Merge pull request #7291 from ttaubert/cardsview/bug-826354-dont-show-when-locked

Bug 826354 - Don't show cards view when screen is locked
Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event
Merge pull request #7290 from timdream/scm/remove-cpulock-when-manual-off

Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event, r=etienne, a=blocking-basecamp
Merge pull request #6845 from jedp/811528-pref-identity-on

Bug 811528 - pref native identity on; r=ferjm