removed log
fixed conflict with development.log
removed facs
mainfacultyview + tabparentcoursesview
fixed conflicts