merging
Merge branch 'master' of https://github.com/eksoderstrom/EFS

Conflicts:
	client_classes.py