Update members page
Resolve conflicts

Conflicts:
	public/styles/site.min.css
	public/styles/site/variables.less