Added filter to display prices as currency.
Merge remote-tracking branch 'origin/HEAD' into HEAD
Re-arranged methods in