Bug 841321 - Moving wifi fixing as global option since Wi-Fi is not SIM specific
Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo
Merge pull request #8169 from lodr/bug-841321-wifi-reset

Bug 841321 - Moving wifi fixing as global option since Wi-Fi is not SIM specific
Cause r+
Bug 842268 - Even if scripts are not fully loaded Lazy loader may incorrectly notify the caller about loading complete
Merge pull request #8175 from jmcanterafonseca/bug_842268

Bug 842268 - Even if scripts are not fully loaded Lazy loader may incorr...
Merge pull request #8177 from borjasalguero/restore_desktop_testing

Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo
Bug 841815 - disabled _sendAlarmNotification test case since it always failed on travis
Bug 840627 followup - moving the icons 1px up, 1px to the right
r=vingtetun
Merge pull request #8185 from etiennesegonzac/bug-840627-followup

Bug 840627 followup - moving the icons 1px up, 1px to the right
Bug 841815 - Added try to avoid test failed on firefox 18
Merge pull request #8179 from yurenju/travis

Bug 841815 - Re-enable gaia unit tests on Travis-CI, r=timdream
Merge branch 'master' of https://github.com/mozilla-b2g/gaia