merge from master
fixed an operator precedence bug
Merge branch 'master' into Measure

Conflicts:
	MoteApp/Measure/Makefile
struct for configuration (defined in Measure.h)
struct measure_options: removed .series member

because we don't need it (at least not in this part of the code)
Merge branch 'master' of github.com:dgarth/foll_inf_uni-goettingen_ws1213

Conflicts:
	MoteApp/Measure/MeasureTestC.nc
Merge branch 'Measure'