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
Bugfix and validation check for APMatrix
Bugfix
Added javadoc
Localisation belief can now be reset to uniform
Training done training set rather the whole
Optimisation and logging
Variance now returns upper or lower variance
Average value is 0 if there are no measurements
Remove some stale commented code
Slide SlidingMenu open only when done from margin
Enable rudimentary AnalysisFragment data plotting
Average,variance return default values when empty
Updated javadoc
Added TODO in the code

Must do it later
Add variance plots for RSSI measurements
convergeAllTo now returns list, not collection
Persistence for RSSI stores cells to unique files

Deprecated the old way
Movement fragment uses new persistence style