traces
Merge branch 'tomas-devel' of https://github.com/lsel2014/lsel2014 into tomas-devel

Conflicts:
	SoftwarePi/railway.c