Merge lp://staging/~ted/url-dispatcher/devel into lp://staging/url-dispatcher/16.10

CMakeLists.txt (+12/-4)
data/CMakeLists.txt (+10/-0)
data/bad-url.qml (+42/-0)
data/url-dispatcher-update-user.conf.in (+1/-1)
data/url-dispatcher.conf.in (+4/-0)
debian/apparmor/url-dispatcher-bad-url-helper (+15/-0)
debian/changelog (+25/-2)
debian/control (+24/-5)
debian/rules (+4/-0)
debian/url-dispatcher-tools-gui.install (+2/-0)
debian/url-dispatcher.install (+3/-0)
gui/CMakeLists.txt (+13/-0)
gui/url-dispatcher-gui.desktop.in (+6/-0)
gui/url-dispatcher-gui.qml (+59/-0)
gui/url-dispatcher-gui.svg (+129/-0)
po/CMakeLists.txt (+39/-0)
po/POTFILES.in (+1/-0)
po/genpotfiles.sh (+6/-0)
service/CMakeLists.txt (+11/-13)
service/bad-url/CMakeLists.txt (+14/-0)
service/bad-url/exec-tool.c (+42/-0)
service/dispatcher.c (+141/-6)
service/dispatcher.h (+2/-1)
service/overlay-tracker-iface.h (+1/-0)
service/overlay-tracker-mir.cpp (+70/-39)
service/overlay-tracker-mir.h (+22/-8)
service/overlay-tracker.cpp (+9/-0)
service/overlay-tracker.h (+1/-0)
service/scope-checker-facade.h (+27/-0)
service/scope-checker.cpp (+114/-0)
service/scope-checker.h (+29/-0)
service/service.c (+9/-1)
service/url-overlay/CMakeLists.txt (+14/-0)
tests/CMakeLists.txt (+3/-0)
tests/app-id-test.cc (+27/-29)
tests/apparmor-mock.c (+36/-0)
tests/apparmor-mock.h (+20/-0)
tests/click-data/manifests/com.test.good.manifest (+1/-1)
tests/click-data/manifests/com.test.multiple.manifest (+3/-3)
tests/dispatcher-test.cc (+84/-1)
tests/overlay-tracker-mock.h (+6/-0)
tests/overlay-tracker-test.cpp (+41/-12)
tests/scope-mock.h (+95/-0)
tests/service-test.cc (+8/-3)
tests/test-config.h.in (+1/-1)
tests/ual-link-farm/com.test.good_app1_1.2.3.desktop (+1/-0)
tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop (+1/-0)
tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications/org.canonical.app1.desktop (+4/-0)
tests/xdg-data/applications/foo-bar.desktop (+1/-0)
tests/xdg-data/libertine/ContainersConfig.json (+14/-0)