Fixed an issue in the name validation. Now uses the correct string
resources for album/image validation error popup.
Merge branch 'master' of https://github.com/bsanders/softeng