work on improvements for album-photo link
carry through albumpicture and picture separation
Merge branch 'devel'