Merge branch 'edge' of github.com:webnotes/erpnext
[cleanup] started responsive layouts and removed tinymce
[style] moving to 100% bootstrap css, started form / appframe headers
[merge master
]
[merge edge]
[style] [upgrade] moved to bootstrap 3
[toolbars] [design] commonified into common toolbar
[sales taxes and charges] renamed field cost_center_other_charges to cost_center
[patches] removed export file from update file data patch
Merge branch 'master' into responsive
[merge] fix
[merge]
[grid] [permissions] added
Merge branch 'master' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/patch_list.py
Merge branch 'master' of github.com:webnotes/erpnext into webshop

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
Merge branch 'master' into responsive
Merge branch 'master' into responsive
[form] [comments] fixed
Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	patches/april_2013/p05_update_file_data.py