more fixes
Merge branch 'master' of github.com:daboe01/Cellfinder

Conflicts:
	backend.pl
	public/.DS_Store
	public/Frontend/AnnotatedImageView.j