fix welcome
adding json source and fix welcome controller
add table
Merge remote-tracking branch 'origin/master'
add table