Tariq
tariq

Merge branch 'master' of https://github.com/missuperior/MySuperior

Conflicts:
	supapplication/controllers/admission_r.php
tariq
Merge branch 'master' of https://github.com/missuperior/MySuperior

Conflicts:
	supapplication/controllers/admission_r.php