Merge pull request #653 from jonezy/master

synching production
Calculator resource updates
Merge pull request #655 from shutter111/master

Calculator resource updates
homepage updates and fixed icons

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'master' of github.com:RichmondDay/www.mini.ca