modified makefile, updated date
Merge branch 'master' into devel

Conflicts:
	DESCRIPTION