adds
Merge remote-tracking branch 'origin/wsq' into 123
addsss
addss
upda
Merge remote-tracking branch 'origin/123' into wsq

Conflicts:
	Web/Views/Default/ActivityInfo.cshtml