clear love ei ei
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa

Conflicts:
	backoffice/template_c/544eb269e68d05920d56f6958356f3f7113858b1.file.form_spa.html.php