method name refactored.
Merge remote branch 'origin/master'

Conflicts:
	logs/server.log