[fix] [permissions] Serial No - Read, Write permission for Accounts User
[fix] [minor] fixes in updating warranty period of serial no
[minor] imported cstr in selling_controller
[major] upgrade to bootstrap 3
Merge branch 'master' of github.com:webnotes/erpnext
[fix] [minor] webshop fixes after bootstrap 3
[fix] [minor] changed validation message
[fix] [minor] fixes in item merging
Merge branch 'master' of github.com:webnotes/erpnext