Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Members/index.ctp
t
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Members/index.ctp