clear tem c
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa

Conflicts:
	backoffice/template_c/0cc5612f2b8da9aa71c09fc4bfb6d25d4a9518cf.file.form_table_header.html.php
	backoffice/template_c/5a4444bf579b4ca48a0a8395c74326af9e3bc40b.file.form_products.html.php
	backoffice/template_c/60ea36815315be1e19cea1ca0304c346f069ae1a.file.form_promotion_service_lists.html.php
	backoffice/template_c/7765a680013337f193ec07ff2df8e153935290dc.file.form_companies.html.php
	backoffice/template_c/9a020b9c81648d3d03f178f9f9d6dd68f5ff5d78.file.manage_table.html.php