Extend the class Repository in Author. Fix merge conficts.
Merge branch 'master' of github.com:felipecwb/SimpleRestService