add server name unique name generator
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/__init__.py