[minor] added simplified and traditional chinese in languages list
[fix] [minor] email settings - set send print in body and attachment
[minor] make slow branch migratable to master
[hotfix] fix null issue in budget variance
Merge pull request #1160 from webnotes/develop

[hotfix] fix null issue in budget variance
[fix] [minor] set send_print_in_body_and_attachment in email settings
bumped to version 3.1.1
Merge pull request #1157 from pdvyas/slow-migration-patch-fix

[minor] make slow branch migratable to master
Merge pull request #1154 from anandpdoshi/hotfix

[minor] added simplified and traditional chinese in languages list
[fix] [minor] customer_name not visible in sales invoice
[fix] [minor] remove email patch
[fix] [minor] customer name visibility fixed in sales invoice
Merge pull request #1167 from akhileshdarjee/master

[fix] [minor] customer name visibility fixed in sales invoice
bumped to version 3.1.2
Merge develop for release
[fix] [minor] rename fix for customer and supplier
[fix] [minor] supplier & customer rename fix
[fix] [minor] stashed bom.txt
[fix] [minor] merge conflict fixes
[fix] [minor] merge conflict fix