Revert "Refactor Measurement class"

* It was causing deserialization issues
Merge branch 'master' of github.com:jjpe/Collector into analysis-fragment

Conflicts:
	src/org/collector/Measurement.java