Added dispenser capabilities and a filter to the dispenser app
<merge> resolving merges