* on revient la version d'avant le conflit
* on remet le sql
Merge branch 'master' of github.com:StarshineOnline/Starshine-Online