changes to reservations
js
Merge branch 'master' of https://github.com/newlookrepo/nlb_salon

Conflicts:
	wp-content/themes/saloon/js/bootstrap-datetimepicker.js
	wp-content/themes/saloon/js/moment.js
backoffice