[Merge] lp:~bfiller/ubuntu/trusty/ubuntu-settings/touch-settings-click into lp:ubuntu/ubuntu-settings

[Bill Filler]

yes that is the case until the Launcher supports favorites that don't require version number per https://bugs.launchpad.net/unity8/+bug/1239750
-- 
https://code.launchpad.net/~bfiller/ubuntu/trusty/ubuntu-settings/touch-settings-click/+merge/206530
Your team Ubuntu branches is subscribed to branch lp:ubuntu/ubuntu-settings.