added pretty json view

used angularjs json methods

improved the security of the json prettyfied output in table module
fixed merge conflict