sync
Merge branch 'master' of github.com:yarden-livnat/cnome

Conflicts:
	cnome/src/edu/utah/sci/cyclist/neup/ui/views/FlowView.java