Fixing a comment
Payment/receipt search now ignores inactive customers
Merging from server