[Bug 829532] fix translation of shortcuts in More select [r=crdlc]
[Bug 829480] Fix home on smart folder to go back to gaia [r=crdlc]
Bug 829163 - [SMS] The keyboard should not be raised when you enter a thread until the user focus the message field r=julienw
Bug 830363 - [Facebook] Und appears for Others instead of # [r=jmcanterafonseca]
Bug 816646 [Facebook] Better error messaging needed when offline
Merge pull request #7541 from jmcanterafonseca/no_conn_msg

Bug 816646 [Facebook] Better error messaging needed when offline
Merge pull request #7613 from crdlc/bug-830363

Bug 830363 - [Facebook] Und appears for Others instead of # [r=jmcantera...
[Bug 826278] Bugfix - Installed apps/bookmarks icon images in Evme [r=vingtetun]
Merge pull request #7557 from EverythingMe/bugfix-home-smartfolder

[Bug 829480] Fix home on smart folder to go back to gaia [r=crdlc]
Merge pull request #7559 from EverythingMe/bugfix-folders-more-l10n

[Bug 829532] fix translation of shortcuts in More select [r=vingtetun]
Merge pull request #7591 from EverythingMe/bugfix-bookmark-icon3

[Bug 826278] Bugfix - Installed apps/bookmarks icon images in Evme [r=vingtetun]
Merge pull request #7595 from borjasalguero/bug_829163_keyboard

Bug 829163 - [SMS] The keyboard should not be raised when you enter a th...
Merge remote-tracking branch 'upstream/master' into ux