Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Bug 826274 - Disabled lock screen sound still plays
Merge pull request #14738 from gregorwagner/back

Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Mario...
Merge pull request #14492 from chuck-lee/bug-947810_show_wap_push_auth_info

Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Merge pull request #14704 from KevinGrandon/bug_826274_annoying_sound

Bug 826274 - Disabled lock screen sound still plays r=timdream
Travis bustage fix