[IMP] Product Image Batch Uploader menuitem now appears under the 'Configuration' submenu.
[ADD]Include company names in currency drop-downs
[ADD]Adds a category to the sales order
[FIX]Added category column in quotation tree view and made category tree lines directly editable.
[FIX] Sale order using order prefix when duplicate
[FIX] Purchase order using order prefix when duplicate
Merge pull request #1 from credativUK/bug_fix_order_prefix

[addons-7.0][FIX] Orders using wrong order prefix when duplicated
Merge pull request #2 from credativUK/bug_fix_order_prefix

Merge addons-7.0 back in to master
[FIX]Made categ_id field not required
[IMP] 'View' locations are no longer selectable when specifying a return location.
Merge branch 'sale_order_category'

Conflicts:
	sale_order_category/sale_order.py
[FIX]Added read access to salesmen and all rights to sales managers for categories
[FIX]Removed temporary files
Merge branch 'sale_order_category'
[ADD] Module which adds Category ID to products (rather than templates).
[MERGE] Merge remote-tracking branch 'origin/product-product-category'
Merge branch 'master' into addons-7.0
Merge branch 'addons-7.0'
[ADD] Module which auto-sets the Sales Team on Sale Orders based on the partner.
[REF] Added licencing headers to a couple of files.