added role & membership
Merge branch 'master' of https://github.com/tbloncar/portal_1871

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/tbloncar/portal_1871

Conflicts:
	db/schema.rb