search
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa

Conflicts:
	backoffice/template_c/5a9035e5238a3c8d667f080899ae1f6da5f5e566.file.login.html.php