Json Controller
Merge branch 'task7'