[composer] updated composer
Merge branch 'master' of github.com:constructions-incongrues/net.musiqueapproximative.www

Conflicts:
	composer.phar
correction nav-r