fix build
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Conflicts:
	CMakeLists.txt