getResources method added to service
Merge branch 'master' of https://github.com/aLyapricon/wiseOS
resources added
conflict resolved
resource, assignment store