Bug 820288 - [Captive Portal] Need the notification to disappear
Merge pull request #7764 from alivedise/bugzilla/820288

Bug 820288 - [Captive Portal] Need the notification to disappear, r=timdream, a=blocking-b2g:shira+
Bug 833940 - Fix maps geolocation r=fabrice a=tef+
Merge pull request #7795 from fzzzy/master

bug 833940 -- fix maps geolocation and storage permissions, use manifest url in marketplace