Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Broker working
Seeker working
Add override of local ip address resolution
Merge remote-tracking branch 'upstream/master'

Conflicts:
	orange/broker.py
	orange/seeker.py
Merged
Merge pull request #82 from katharosada/mercimaster

Add override of local ip address resolution
Merge pull request #78 from flazzarini/master

Working Broker/Seeker