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

Conflicts:
	backoffice/template_c/0cc5612f2b8da9aa71c09fc4bfb6d25d4a9518cf.file.form_table_header.html.php
	backoffice/template_c/162b5a1559ed76f7da3b10d56ea4271e32e1a227.file.form_orders.html.php
	backoffice/template_c/9a020b9c81648d3d03f178f9f9d6dd68f5ff5d78.file.manage_table.html.php
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa