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