Restore the resource_service file
Merge 'upstream/master' into code_generator
Merge branch 'master' into code_generator
Merge 'upstream/code_generator'
Merge pull request #111 from devin-c/code_generator

Code generator passing specs