Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/GUI.o
	bin/System.o
	bin/TestGribouille_1417351321.xml
	sources/System.cpp
Merge branch 'master' of https://github.com/Melyre/Projet-Tamagoshi