no message
Merge branch 'master' of http://github.com/orchestraLight/orchestraLight

le bon fichier sql est commmit

Conflicts:
	orchestra_light.sql
Merge branch 'master' of http://github.com/orchestraLight/orchestraLight