Had to name ifndef DEBUG to avoid problems with identifier in Shakespeare Priority enum
Merge branch 'master' into schedule
Some small integration work for timetag command
Merge branch 'schedule' of https://github.com/spaceconcordia/space-commander into schedule

Conflicts:
	Makefile
	tests/unit/timetag-test.cpp