Add autofocus to search modal and improve teachers edit layout
Tweek calendar.js code and return textColor with json events for calendar
Merge conflicts