changed all json to customjsonresult
reporting in there
Merge branch 'reporting' into development