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
Bug 826289 - Make default bookmarks customisable
bug 824621, localize email address placeholder in ftu
Bug 823370 - [FTU] Hit Import SIM contacts multiple time will create duplicate contacts
Bug 808618. Pick Contact Activity cross icon in header
Merge pull request #7293 from Pike/bug-824621-l12y-email-address

bug 824621, localize email address placeholder in ftu
Fix unit test instructions in readme
Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "Looking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround); r=asuth, a=blocking-basecamp
Merge pull request #7296 from mozsquib/email-autoconfig-xhr-workaround

Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "L.ooking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround)
Bug 823619 - convert Gaia to mobile mouse events r=vingetun,cjones,cpeterson,djf a=blocking+
Bug 826621 - when we clear a media frame, remember that we cleared it r=daleharvey a=blocking+
Merge pull request #7297 from davidflanagan/bug826621

Bug 826621 - when we clear a media frame, remember that we cleared it r=daleharvey a=blocking+