Using GUI SnapShot to locate source code.
Using GUI SnapShot to locate source code.
Merge origin/master

Conflicts:
	web/Dashboard.jsp
Merge origin/master