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

Conflicts:
	supapplication/New folder/controllers/accounts.php
	supapplication/New folder/controllers/examination.php
	supapplication/New folder/views/admin/city/viewcities.php
	supapplication/New folder/views/admissions/inquiry/addinquiry.php
	supapplication/New folder/views/admissions/inquiry/editinquiry.php
	supapplication/New folder/views/index.html
	supapplication/views/admin_ace/admin_side_menu.php