commit jojo
Merge branch 'master' of https://godsend@github.com/gregaubert/Cinemania_client.git