12/10/2014 3:05
Merge branch 'master' of https://github.com/chintinntan/OME

Conflicts:
	application/views/admin/assign_course_section.php
Merge branch 'master' of https://github.com/chintinntan/OME