Bug 827749 - Store dummy file as a dotfile so it is ignored by the gallery
Bug 828479 - fix online support in Settings
Merge pull request #7447 from fabi1cazenave/settings-online-support

Bug 828479 - fix online support in Settings
Merge pull request #7438 from daleharvey/camera-crash

Bug 827749 - Store dummy file as a dotfile so it is ignored by the galle...
Auto-merge from branch 'master'