Bug 825327 - Don't mess with the navBar after we've started the tutorial.
Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
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 #7273 from davidflanagan/bug825615

Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
Merge pull request #7271 from davidflanagan/bug824099

Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
[Bug 816243] Adjust max-width calculation for awesomescreen tabs. r=vingtetun
Merge pull request #7283 from leibovic/overflow

[Bug 816243] Adjust max-width calculation for awesomescreen tabs. r=vingtetun a=bb+
Merge pull request #7284 from mrbkap/825327-ftu-error-last-step

Bug 825327 - Don't mess with the navBar after we've started the tutorial...
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
Merge branch 'master' of git://github.com/mozilla-b2g/gaia