Merge branch 'thread_pool' of ssh://github.com/lishmael/test into thread_pool

Conflicts:
	Avid-test/ItemListHandler.cpp
	Avid-test/ItemListHandler.h
Merge branch 'thread_pool' of ssh://github.com/lishmael/test into thread_pool

Conflicts:
	Avid-test/ItemListHandler.cpp