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

Conflicts:
	enigma.php

	modified:   controler/bdd.php
	modified:   controler/global.php
	new file:   controler/truser.php
	modified:   create_user.php
	modified:   enigmas.php
	modified:   index.php
	new file:   model/truser.php
	new file:   pages/banner_createuser.php
	modified:   pages/banner_logged.php
	modified:   pages/banner_notlogged.php
	modified:   pages/index_content_logged.php
	modified:   pages/index_content_notlogged.php
	new file:   pages/test.html
	modified:   rbpe.sql
	new file:   resources/0-Kleidos Logo.png
	modified:   style.css
fixed error on merge for enigma.php
Fixed answer_available()
1618
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