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/586170fe5de8f23c336e3d02cc65dd24e50854a0.file.form_service_lists.html.php
	backoffice/template_c/5a9035e5238a3c8d667f080899ae1f6da5f5e566.file.login.html.php
	backoffice/template_c/9a020b9c81648d3d03f178f9f9d6dd68f5ff5d78.file.manage_table.html.php
	backoffice/template_c/a4b0372ea48b9eb81ac0e87d0244d72c11fc23ba.file.form_receives.html.php
	backoffice/template_c/b32426c8c97490d2100ed85dbf5ae2c6e3e52f12.file.getProductListOfOrder.html.php
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa
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/295699239a84b69240c01c78752ca400e4ba34ff.file.form_time_attendances.html.php
	backoffice/template_c/2a1643d9f3b7447d1c25ce2a05226a857b050290.file.form_customers.html.php
	backoffice/template_c/501011bf7a8de77445f0f40fe18ec9508e2c1836.file.form_services.html.php
	backoffice/template_c/586170fe5de8f23c336e3d02cc65dd24e50854a0.file.form_service_lists.html.php
	backoffice/template_c/5a9035e5238a3c8d667f080899ae1f6da5f5e566.file.login.html.php
	backoffice/template_c/9a020b9c81648d3d03f178f9f9d6dd68f5ff5d78.file.manage_table.html.php
	backoffice/template_c/a4b0372ea48b9eb81ac0e87d0244d72c11fc23ba.file.form_receives.html.php
	backoffice/template_c/b32426c8c97490d2100ed85dbf5ae2c6e3e52f12.file.getProductListOfOrder.html.php
	backoffice/template_c/bda8342328ba1fe618076434ede7e93df947df7f.file.form_employees.html.php
no message
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa
no message
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa
no message
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa

Conflicts:
	backoffice/template_c/9a020b9c81648d3d03f178f9f9d6dd68f5ff5d78.file.manage_table.html.php