Version 6.1
Merge branch 'Fritz', upgrade to 6.1

Conflicts:
	c-support/codesnippets/calloc_double_matrix.c
	c-support/codesnippets/calloc_int_matrix.c
	c-support/codesnippets/print_array.cc.noindent
	c-support/templates/Templates
	c-support/templates/cpp.comments.template
	c-support/templates/cpp.cpp.template
	c-support/templates/cpp.idioms.template