.
z
Merge remote-tracking branch 'origin/matt' into raph

Conflicts:
	controler/answer.php

	modified:   controler/enigma.php
	modified:   enigma.php
	modified:   pages/banner_createuser.php
	modified:   pages/banner_logged.php
	modified:   pages/banner_notlogged.php
a