role
Merge branch 'master' of https://github.com/webtips/srsg
role
Merge branch 'master' of https://github.com/webtips/srsg into dev2

Conflicts:
	config/routes/cms/routes.rb
file attach
workflow
fix: role
Merge branch 'dev2' of https://github.com/webtips/srsg
fix: role, sys_site form
Merge branch 'dev2' of https://github.com/webtips/srsg
fix: role
add permission to workflow
role: seed users
Merge branch 'dev4' into dev2
fix: role, workflow
fix: seed users
Merge branch 'dev2'