baseclass modify
Merge branch 'master' of github.com:/hbnn/DataPackage

Conflicts:
	baseclass/database.pyc
	baseclass/excel.py
Merge branch 'master' of github.com:/hbnn/DataPackage