merged with the search branch

git-svn-id: file:///var/www/svn/anahita/photos/trunk@17268 a933e228-e664-4d3f-8241-49479697c698
testing the master commit

git-svn-id: file:///var/www/svn/anahita/photos/trunk@17279 a933e228-e664-4d3f-8241-49479697c698