BVT fixes
BVT Fixes
Merge branch 'master' into BVTFixes

Conflicts:
	domino/nsf/socialenabler/XPagesSBT.nsf
	domino/nsfsrc/nsf.socialenabler/XPagesSBT/XPages/SametimeWidgets.xsp
Merge pull request #341 from padraic-edwards/BVTFixes

Bvt fixes