Fixed crash after loading data problem
Merge branch 'tracer_model' of ssh://github.com/sandialabs/slycat into tracer_model

Conflicts:
	web-server/js/tracer-image/movie.js