Merge branch 'master' of https://github.com/miton18/Framenade

Conflicts:
	site/controllers/documents.php
	site/index.php

Signed-off-by: guy-yann <refranguy@hotmail.fr>