Updated: Changes to Widget Page
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Dashboard/PRDash/src/client/index.html