Merge branch 'dev' of https://github.com/francisfueconcillo/myCloud into dev