[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
[minor] budget cleanup
Merge branch 'master' of github.com:webnotes/erpnext into perpetual
[demo] [minor] Added accounts, moved JV creation to server-side
[fix] [minor] removed reserved warehouse from no_copy in sales order item
Merge branch 'master' of github.com:webnotes/erpnext into perpetual
[cleanup] [minor] deprecated budget control and rewritten budget related code
[cleanup] [minor] budget code cleaned up with testcases