fann import + cmake fix

Conflicts:
	CMakeLists.txt