show data form controller
Merge origin/master