test
sync
rename back to cyclist
add back as cyclist
sync
Merge branch 'master' of github.com:yarden-livnat/cnome
adapting to the new table schema
fix background color of IntegerField when the text changed but not committed
fix the header layout in FlowNode
Changing generalconfig.xml file location from user.dir to user.home
various changes
Merge branch 'master' of github.com:SCI-Utah/cnome

Conflicts:
	cyclist/src/edu/utah/sci/cyclist/core/controller/WorkDirectoryController.java
replace .cnome with .cyclist
add missing file
fix a bug
Merging the schema "Measure" and "Dimension" to one panel
Merge branch 'master' of https://github.com/SCI-Utah/cnome
Added "INT_TIME" value to the field data_type role enum
fix the  open/close of the flow chart
Merge branch 'master' of github.com:SCI-Utah/cnome
fix the bug where the range rectangle on the chart disappeared.