Merge two projects
Fixed object mapper to be created by the Spring framework and injected to all classes
Merge pull request #1 from mayaheim/master

Merge two projects