Kaiymu/RyS — pull request #3 by Kaiymu (2014-05-27 20:49:37+00:00)
Title: Develop

Merge entre notre dev' sur develop et master.