modified code controller and views.
Merge branch 'develop'