Showing users and connectors on members page
Merge branch 'staging'

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/OuiShare/OuiShare

Conflicts:
	Gemfile.lock