finish the simple workflow
Merge branch 'master' of github.com:sundevilyang/CNPE

Conflicts:
	app/views/requests/_form.html.erb