Fixed merging issue and added gallery app engine index