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
.
z
gfgsg
Revert "gfgsg"

This reverts commit 4df0c9dfcb8eafabbcbe5dd7645b7cfd44d77db0.

	modified:   rbpe.sql
last fix of branch backup
Update resources filename
Revert "Update resources filename"

This reverts commit b62ac0162ef87dcbb68549a00387b7134988d95a.
picture filename
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
5 answer submitted not 6