bugfix

GROTE git bugfix met Vendor
test
Merge branch 'test'
Merge branch 'master' into test
Merge branch 'test'
Merge branch 'test'

Conflicts:
	app/validators/CustomValidation.php
	app/views/content/profile.blade.php
	app/views/content/profileEdit.blade.php