fix bug with edit dashboard
Merge remote-tracking branch 'origin/master'