factories added
Merge branch 'not-tested'

Conflicts:
	CMakeLists.txt
	audioDescriptors/audiodescriptorextractor.cpp
	audioDescriptors/audiodescriptorextractor.h
	audioDescriptors/audiorecorddescriptors.cpp
	audioDescriptors/audiorhythmdescriptors.cpp
	main.cpp