solve conflict
Merge branch 'develop' of https://github.com/skyhills13/PhotoMosaic.git into develop