Added members page, styling, merge

Merge branch 'master' into dev-accounts

Conflicts:
	public/stylesheets/layout/general.styl
	views/navigation.jade