Some more changes to schedule modal
Merge remote-tracking branch 'origin/newmodal'

Conflicts:
	beauty-client/app/views/schedule/scheduleModal.html