Merge branch 'master' of C:\Users\Alex\Documents\GitHub\ThumbPedo with conflicts.