Jmsdashboard

Merging the <b>"jmsdashboard"</b> branch into <b>"master"</b>