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