Merge origin/master

Conflicts:
	web/Dashboard.jsp
Revert "Merge origin/master"

This reverts commit 5be92a11a42765853d37ac1ca67b7a57bcd98c36.
Revert "Revert "Merge origin/master""

This reverts commit e3c9abcf46ce09c329db9d05dc368d0ddba734b4.
Revert "Revert "Merge origin/master""

This reverts commit e3c9abcf46ce09c329db9d05dc368d0ddba734b4.