Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'

Conflicts:
	testbed/include/JobManagerTest.h
	testbed/include/ListTest.h
	testbed/include/MapTest.h
	testbed/include/ResourceLoadTest.h
	testbed/include/TestBedCore.h
	testbed/src/HeartTestBed.cpp
	testbed/src/JobManagerTest.cpp
	testbed/src/ResourceLoadTest.cpp
	testbed/src/TestBedCore.cpp
Merge remote-tracking branch 'origin/development'
Starting to add viewer api lib
Merge remote-tracking branch 'origin/master' into development
viewer package api initial version
module and action stack first pass
test texture plug in
Adding FreeImage (temp, would like to remove at a later date)
updated build scripts
Added texture manager plugin.
Lots of changes to viewer plugin stuff to make things work