merging/cfm updates
state search on picking state
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ciccfm/state.cfm
Merge pull request #161 from jpecht/master

state search on picking state / cfm update / merge