commit de maj
Merge branch 'master' of github.com:fredmontet/musicmatcher

Conflicts:
	musicmatcher/www/proxy.php