Merge branch 'master' of http://github.com/ungdev/site-etu
Merge branch 'stable'