Merge pull request #10 from ehuelsmann/1.4

Fix password reset issue.
Merge pull request #13 from ehuelsmann/1.4

Add '.empty' files to empty directories so
Merge pull request #15 from ehuelsmann/1.4

Fix 'On Hold'/'Off Hold' button text.
Merge pull request #18 from ehuelsmann/1.4

Printing without an invoice number now errors instead of increments
Merge pull request #20 from ehuelsmann/1.4

Fix wrong buttons appearing in new invoice.
Merge pull request #23 from ehuelsmann/1.4

Missing AR_tax/AP_tax account link fix & miscelaneous changes.
Merge pull request #25 from ehuelsmann/1.4

Fix #1083: Draft invoices (and draft transactions, btw) don't redirect c...
Merge pull request #28 from ehuelsmann/1.4

Fix #1102 and #1098: fix AR/AP tax included and overwritten notes.
Merge pull request #31 from ehuelsmann/1.4

Fix #1096: double message in es_AR.po translation.
Merging in ICE Payments fix
Merge branch '1.4' of https://github.com/ledgersmb/LedgerSMB into 1.4

Conflicts:
	Changelog
Merge pull request #34 from einhverfr/1.4

Merging in ICE Payments fix
Merge pull request #5 from ledgersmb/1.4

Merge Chris's fixes to 1.4 branch.