login over browser popup stuff
Merge branch 'master' of github.com:downloadam/client
Merge branch 'master' of github.com:downloadam/client

Conflicts:
	client/settings.py
fixed package state/tab bug when files are deleted
some client login changes
Merge branch 'master' of github.com:downloadam/client