complete json view component
Merge branch 'working' into develop