20130926
Merge branch 'master' of github.com:lzhang007/process-simulation

Conflicts:
	process.h
Merge branch 'master' of github.com:lzhang007/process-simulation

Conflicts:
	process.h
201309271306