Add service condition if user only input IP without port
Merge branch 'master' into win7

Conflicts:
	lib/common.py