Fixed gcc 4.6 warnings.
Fixed the fix.
Merge branch '3.1'

Conflicts:
	src/comforce.c
	src/debug.c
	src/iccp3m.c
	src/maggs.c
	src/mmm2d.c
	src/p3m-dipolar.c
	src/p3m.c
	src/tcl/statistics_tcl.c