working hard force :)
Merge branch 'master' of https://github.com/wimhendrickx/TravelSalesMan

Conflicts:
	biz/country.pyc