minor changes
Merge branch 'master' into mike1
Fix for thomas' error messages. again.
Can't return items older than 15 days anymore
Merge branch 'mike1'