update
Merge branch 'master' of https://github.com/iYottt/graduate

Conflicts:s
	application/helpers/MY_date_helper.php
	application/libraries/MY_Model.php
	application/modules/documents/controllers/bv01.php
	application/modules/documents/controllers/bv02.php
	application/modules/documents/controllers/bv03.php
	application/modules/documents/controllers/bv05.php
	application/modules/documents/controllers/bv09.php
	application/modules/documents/controllers/bv10.php
	application/modules/documents/views/bv01/form.php
	application/modules/documents/views/bv01/print.php
	application/modules/documents/views/bv02/form.php
	application/modules/documents/views/bv02/index.php
	application/modules/documents/views/bv03/form.php
	application/modules/documents/views/bv03/index.php
	application/modules/documents/views/bv03/print.php
	application/modules/documents/views/bv04/form.php
	application/modules/documents/views/bv04/print.php
	application/modules/documents/views/bv05/index.php
	application/modules/documents/views/bv05/print.php
	application/modules/documents/views/bv09/print.php
	application/modules/documents/views/bv52/index.php
	application/modules/login/controllers/login.php
	application/modules/login/views/login.php
	application/modules/setting/controllers/around.php
	application/modules/setting/controllers/building.php
	application/modules/setting/controllers/calendar.php
	application/modules/setting/controllers/campus.php
	application/modules/setting/controllers/cause_end.php
	application/modules/setting/controllers/center.php
	application/modules/setting/controllers/center_learning.php
	application/modules/setting/controllers/classroom.php
	application/modules/setting/controllers/course.php
	application/modules/setting/controllers/degree.php
	application/modules/setting/controllers/department.php
	application/modules/setting/controllers/education.php
	application/modules/setting/controllers/faculty.php
	application/modules/setting/controllers/field.php
	application/modules/setting/controllers/grade.php
	application/modules/setting/controllers/major.php
	application/modules/setting/controllers/master_data.php
	application/modules/setting/controllers/number.php
	application/modules/setting/controllers/plot.php
	application/modules/setting/controllers/sector.php
	application/modules/setting/controllers/subject.php
	application/modules/setting/controllers/subject_cat.php
	application/modules/setting/controllers/subject_group.php
	application/modules/setting/controllers/subject_type.php
	application/modules/setting/controllers/teacher.php
	application/modules/setting/controllers/university.php
	application/modules/setting/controllers/user.php
	application/modules/setting/controllers/user_type.php
	application/modules/setting/views/around/index.php
	application/modules/setting/views/building/form.php
	application/modules/setting/views/building/index.php
	application/modules/setting/views/calendar/form.php
	application/modules/setting/views/calendar/index.php
	application/modules/setting/views/campus/form.php
	application/modules/setting/views/campus/index.php
	application/modules/setting/views/cause_end/form.php
	application/modules/setting/views/cause_end/index.php
	application/modules/setting/views/center/form.php
	application/modules/setting/views/center/index.php
	application/modules/setting/views/center_learning/index.php
	application/modules/setting/views/classroom/form.php
	application/modules/setting/views/classroom/index.php
	application/modules/setting/views/course/form.php
	application/modules/setting/views/course/index.php
	application/modules/setting/views/degree/form.php
	application/modules/setting/views/degree/index.php
	application/modules/setting/views/department/form.php
	application/modules/setting/views/department/index.php
	application/modules/setting/views/education/form.php
	application/modules/setting/views/education/index.php
	application/modules/setting/views/faculty/index.php
	application/modules/setting/views/field/form.php
	application/modules/setting/views/field/index.php
	application/modules/setting/views/grade/form.php
	application/modules/setting/views/grade/index.php
	application/modules/setting/views/major/form.php
	application/modules/setting/views/major/index.php
	application/modules/setting/views/master_data/form.php
	application/modules/setting/views/master_data/index.php
	application/modules/setting/views/number/form.php
	application/modules/setting/views/number/index.php
	application/modules/setting/views/plot/form.php
	application/modules/setting/views/plot/index.php
	application/modules/setting/views/sector/form.php
	application/modules/setting/views/sector/index.php
	application/modules/setting/views/subject/form.php
	application/modules/setting/views/subject/index.php
	application/modules/setting/views/subject_cat/form.php
	application/modules/setting/views/subject_cat/index.php
	application/modules/setting/views/subject_group/form.php
	application/modules/setting/views/subject_group/index.php
	application/modules/setting/views/subject_type/form.php
	application/modules/setting/views/subject_type/index.php
	application/modules/setting/views/teacher/form.php
	application/modules/setting/views/teacher/index.php
	application/modules/setting/views/university/form.php
	application/modules/setting/views/university/index.php
	application/modules/setting/views/user/form.php
	application/modules/setting/views/user/index.php
	application/modules/setting/views/user_type/form.php
	application/modules/setting/views/user_type/index.php
	application/modules/student/controllers/student.php
	application/modules/student/views/form.php
	application/modules/student/views/index.php