Add functionality for dashboard on 2-1*
Merge branch 'master' of ../stage