Merge remote-tracking branch 'photoLoader/master' into feature/HomeScree...

...n