added dashboard on the left
last relative fix
conflict resolve
Merge branch 'master' into gh-pages