Fixed build failed: cannot have both GCS files api and com.google.appengine.tools.cloudstorage.*
Merge pull request #16 from karuto/gallerydev

Fixed build failed: cannot have both GCS files api and com.google.appeng...