Makefile added
Merge branch 'devel' of git:rapid2k1/damlev into devel

Conflicts:
	Makefile