Change Date
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa

Conflicts:
	backoffice/template_c/7558e3fa7d5af0ec85571adf319393c9fdf264ec.file.form_booking.html.php
	backoffice/template_c/bda8342328ba1fe618076434ede7e93df947df7f.file.form_employees.html.php
	backoffice/template_c/dd5d99e532d3b9b9f841d96cc4dfb58080c44f17.file.form_promotions.html.php
Merge branch 'master' of https://github.com/Bellazzz/ProjectSpa