no empty links
Merge remote-tracking branch 'origin/master'

Conflicts:
	albums.php
	system/db-connect.php
no empty links
Merge remote-tracking branch 'origin/master'