Salut salut
Merge branch 'master' of https://github.com/Ralys/Web

Conflicts:
	MiniFramework/bin/Model/Base.php
Merge branch 'master' of https://github.com/Ralys/Web