Bug 809974: Display "Last Updated" date and time in Device Info. r=kaze
Don't show last updated when the setting is empty
Use a multi-line label for Last Updated
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into lastUpdated
Bug 816909 - [SMS] After picking a contact for a new SMS we should focus the message input field
Bug 816908 - [BB] Progress and activity - Update visuals and improve performance
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into lastUpdated

Conflicts:
	apps/settings/index.html
	apps/settings/style/settings.css
Bug 818645 User is unable to scroll entries in the browser's Top Sites, Bookmarks, or History tabs
Bug: 814140 install mochi.test web app
Bug 818807 - Enable screenshot taking and getting for wrapper frames
Bug 817563 - [PhoneNumberJS] Remove .eval() from code
Bug: 814140 mozapp needs to be set when iframe is opened.  The mozapp attribute cannot be changed or added after the iframe is initialized
Bug 817689 - Adding dark overlay to oncall

Fxing race condition between oncall photos

Adding comment
Bug 818470 - [Contacts] typing and scrolling is slow because of -moz-element() usage
Bug 819277 - [Browser] missing thumbnails when a place has no screenshot
Bug 810465 - [calendar]Month title in calendar squashed after resuming the calendar app
Bug 803533 - [Settings] Need call forwarding settings UI.
- l10n follow-up, r=julienw
Merge pull request #6888 from fabi1cazenave/call-followup

Bug 803533 - [Settings] Need call forwarding settings UI, r=julienw
bug 807312: include the missing apn_confs_local.xml file
Merge pull request #6889 from fabi1cazenave/apn_custom

bug 807312: include the missing apn_confs_local.xml file, r=21