updates
Merge branch 'master' of github.com:vrozkovec/fr.ilovejuice