latest
Merge branch 'new-actions' of github.com:flowgrammable/flowsim into new-actions

Conflicts:
	flowsim-ui/app/scripts/services/action.js
	flowsim-ui/test/spec/services/action.js
Merge branch 'new-actions' of github.com:flowgrammable/flowsim into new-actions
latest