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/501011bf7a8de77445f0f40fe18ec9508e2c1836.file.form_services.html.php
	backoffice/template_c/586170fe5de8f23c336e3d02cc65dd24e50854a0.file.form_service_lists.html.php
	backoffice/template_c/7558e3fa7d5af0ec85571adf319393c9fdf264ec.file.form_booking.html.php