role
role_sidebar_layout
1
1
1
Merge branch 'master' of https://github.com/satzcoal/GJD

Conflicts:
	db/schema.rb
Merge pull request #6 from xy19xiaoyu/master

Merge pull request #6 from satzcoal/master
Merge pull request #7 from satzcoal/master

merge1030