old changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/functions.py