Fixed bug in SimpleText - tested in the white lamp
Merge branch 'master' of https://github.com/chili-epfl/metroscope into grammar

Conflicts:
	applications/metroscope/decorators/SimpleText.hpp