[language] Added zh-cn and zh-tw webnotes/erpnext#1099
[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
[fix] [minor] merge conflict fixed
[fix] [minor] setup print fix in sales invoice
Merge pull request #1139 from akhileshdarjee/master

[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
[patch] startup.js styling
[fix] [minor] bom operations fix
Merge pull request #1144 from akhileshdarjee/master

[fix] [minor] bom operations fix
[fix] [minor] Master name validation for customer/supplier/warehouse account
[fix] [minor] make bank voucher from salary manager
Merge pull request #1141 from nabinhait/hotfix

[fix] [minor] Master name validation for customer/supplier/warehouse acc...
Merge pull request #1118 from rmehta/chinese

[language] Added zh-cn and zh-tw webnotes/erpnext#1099
[fix] [minor] fetch items from bom while repacking
Merge pull request #1147 from nabinhait/hotfix1

[fix] [minor] fetch items from bom while repacking
[minor] fixed conflict