[testfix] mocha now scope magic this variable to each describe
Merge pull request #53 from frankrousseau/master

fix album creation
Fixed: the photo counter was not updated when a photo was added or removed in an album. Close #55
Added: reference to imagemagick as a dependency in the readme. Close #54
Merge pull request #56 from jsilvestre/master

Various fixes
Merge branch 'master' of github.com:cozy/cozy-photos

Conflicts:
	client/public/javascripts/app.js.map