no message
Merge branch 'master' of https://github.com/dilidili/FindData

Conflicts:
	src/Commodity.pyc
	src/DataSource.pyc