Changed
Merge branch 'master' of ssh://github.com/PeterDrake/Drosophila

Conflicts:
	src/edu/lclark/drosophila/DataPanel.java
Fixed issue with re-analyzing movie