tum lum tum la

afd
Merge remote-tracking branch 'origin/Thach'

Conflicts:
	MessengerLync2013/Data/Lync/LyncParams.cs