use 4 spaces for indentation
use centralized config.mk for Makefiles
Merge branch 'master' into dissemination

Conflicts:
	BaseStation/BaseStationAppC.nc
	BaseStation/BaseStationC.nc
	Mote/MoteAppC.nc
	Mote/MoteC.nc
	config.mk