Move include album files to above database check.
Merge branch 'master' into fancybox