keychain, images init
Merge branch 'master' of github.com:downloadam/client

Conflicts:
	client/login.py
change_login, image thumbnails over client
Merge branch 'master' of github.com:downloadam/client
fix thumbnail
transfer thumbid
thumbnail fit, 70y
dont use keyring on non frozen builds except macos, fix ssl cert linux
added server template
small fixes
javascript plugin engine
register cocoa
Merge branch 'master' of github.com:downloadam/client
client login via website
added timeout to websocket connect
some updates, removed keyring except from settings.py for later implementation
Merge branch 'master' of github.com:downloadam/client
filebrowser error, multiaccount fix
Revert "some updates, removed keyring except from settings.py for later implementation"

This reverts commit 29f47aa6c64e46962c896872862b8f3906a95a69.
Revert "client login via website"

This reverts commit 0cf597aa073153f66097167a18c21f1c92b82183.