Defensive logic configuration
Merge branch 'master' of https://github.com/jaantti/Firestarter

Conflicts:
	2014/src/RobotLogic.cpp