Resolved conflict in command factory

Merge branch 'master' into schedule

Conflicts:
	include/command-factory.h
	src/command-factory.cpp
Merge branch 'schedule' of https://github.com/spaceconcordia/space-commander into schedule

Conflicts:
	include/command-factory.h
	src/command-factory.cpp
Fixing major compile issues, began porting tests to CPPUtest