Removed most duplication
Merge branch 'master' of github.com:cguyonnet/PhotoMosaic
Started third editor