Updated project with latest changes

The app is working fine this way, so I made a major git add to be sure to have all the corrects files in my github repo