.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/DataService.xml
	data/ClientList.ser
	data/CommodityList.ser
	data/PurchaseList.ser
	data/SaleList.ser
	data/UserList.ser