#694 Added validation for album folderId
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev