rohitMerge branch 'master' of https://github.com/gangadhar-kadam/sms-erpnext

Conflicts:
	selling/doctype/customer/customer.txt
	selling/doctype/sales_order/sales_order.txt
	selling/doctype/sms_center/sms_center.py
Merge branch 'master' of git://github.com/webnotes/erpnext
rohitMerge branch 'master' of https://github.com/gangadhar-kadam/adb-erp

Conflicts:
	selling/doctype/sms_center/sms_center.py