dev1
master1
Merge branch 'dev'

Conflicts:
	client.cpp