code style
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/front_members.php