Fixing resources and bugs
Merge branch 'master' of https://github.com/mellymello/AMT-ProjectREST