Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'edge' of github.com:webnotes/erpnext into edge
Merge branch 'master' into edge

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
[patch] [file data] reset permissions
[DN][usability] copy cost center in each row
[bom] set fetched values at server side
validation for stock and nonstock items in purchase cycle
validation for stock and nonstock items in purchase cycle
[latest updates] added default cost center and update manager
Merge branch 'edge'

Conflicts:
	home/page/latest_updates/latest_updates.js