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

Conflicts:
	enigma.php

	modified:   controler/answer.php
	modified:   controler/code.php
	modified:   rbpe.sql
resolve commit issur on enigma.php
User create form format
1618