merge
Merge branch 'master' of https://github.com/justinliucs/haflow.git

Conflicts:
	src/main/webapp/script/haflow.flow_operation.js
	src/main/webapp/script/haflow.main.js