Up Client
Merge branch 'develop'

Conflicts:
	client.version