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

Conflicts:
	application/modules/setting/views/teacher/form.php