handle issues with password protected albums with "+" signs in the name
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	index.php