Fixed size window and add items on ComboBox
Merge branch 'phase2_KBAddItemsOnComboBox' into phase2

Conflicts:
	Client/AnnoTaskClient/AnnoTaskClient.v12.suo
	Client/AnnoTaskClient/AnnoTaskClient/AddThesaurusWindow.Designer.cs