Merge pull request #567 from tonyrd/development

a bunch of next filter & retailer email body
moved most application shortcuts to iis

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #569 from jonezy/master

moved most application shortcuts to iis
updated mini.calculator.css - made .btn class specific to calc