Develop candidate2

This branch contains all branches for the rewiev and future merge with develop
It's time starting to use Spring build-in json converter