SW-18 Resources class
SW-18 Fixes after CR
Merge branch 'master' of https://github.com/jsolve/sweetener