portfolio albums widget
Merge remote-tracking branch 'origin/master'

Conflicts:
	beheer/pages/customers/delete.php
portfolio albums widget
Merge remote-tracking branch 'origin/master'