menage

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo