phbp v10.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/views/layouts/members/view2.blade.php