show loal ip address
supress bat error messages
Merge remote-tracking branch 'origin/master' into branch-1.0

Conflicts:
	conf/config.json