complete display author server name
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop

Conflicts:
	sys/controller/serverHelper.py
rename