Close #1235 by addressing two bugs (skydrive image and persising colors)
Merge pull request #1240 from javierluraschi/EditCollections

Close #1235 by addressing two bugs (skydrive image and persisting colors)