OS X: Finally(?) fix stay-on-top behaviour of settings dialog

Fixes #1795

Conflicts:
	.gitmodules
	src/mirall/owncloudgui.cpp