In Agent, action for state separated from emotion for state.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	SuperEmo/SuperEmo.suo