merging master with dashboard1.0