Merge pull request #74 from ledgersmb/master

sync over master branch
Merge pull request #78 from ledgersmb/master

sync over master branch
Merge pull request #81 from ledgersmb/master

sync over master branch
Merge pull request #84 from ledgersmb/master

sync over master branch
Merge pull request #461 from einhverfr/master

Fixing bug 1240, false alarms of credit exceeded.
Merge pull request #463 from einhverfr/master

Adding tax_id hidden field to order and offer forms to be able to includ...
Merge pull request #465 from einhverfr/master

Fixing bug 1195, goods and services useless when listing by invoice.
Merge pull request #467 from einhverfr/master

Fixing bug 1247, cannot save shipping record
Merge pull request #470 from einhverfr/master

Fixing bug 1255, timecard__report not found
Merge pull request #473 from einhverfr/master

Now relies on plack, previous stubs and related support files removed
Merge pull request #474 from einhverfr/master

Initial documentation changes regarding Starman.
Merge pull request #476 from einhverfr/master

including fix for 1258
Merge pull request #478 from einhverfr/master

Deleting old sql fixes, which for Master I think we should do monthly.
Merge pull request #479 from einhverfr/master

Database changes for returns
Merge pull request #482 from einhverfr/master

correcting shipto id issues with oe and invoices
Merge pull request #485 from einhverfr/master

Removing sql query that can't work
Merge pull request #487 from einhverfr/master

Returns changes from 1.4
Merge pull request #491 from einhverfr/master

Fixing bug 1262, cannot post overpayment with formatted numbers
Merge pull request #493 from einhverfr/master

Fixing 1263 and fixing some other contact workflow errors
Merge pull request #496 from einhverfr/master

Adding back update button, and merging in fix for 1260