member
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/Lib/Action/Home/MemberAction.class.php
	Public/Home/css/style.css