Merge two projects
Fixed object mapper to be created by the Spring framework and injected to all classes
Merge remote-tracking branch 'origin/master'
extracted AuthenticationResolver to be injected into the controller, and get ObjectMapper injected into it.