Merge branch 'cryptostick-gui' of github.com:ggkitsas/seafile-client into cryptostick-gui

Conflicts:
	ui/create-repo-dialog.ui
Merge branch 'cryptostick-gui' of github.com:ggkitsas/seafile-client into cryptostick-gui

Conflicts:
	ui/create-repo-dialog.ui