Merge pull request #65 from ledgersmb/1.4

1.4, up to date with Erik's uploader changes
fixing preferences screen, dateformat box
Merge pull request #328 from einhverfr/1.4

fixing dateformat on user preferences screen
Merge pull request #20 from ledgersmb/1.4

1.4 - syncing with base