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

Conflicts:
	hr_panel/config/config.php
	hr_panel/controllers/index.html
	hr_panel/models/hris_model.php
	hr_panel/models/index.html
	hr_panel/views/hris_ace/hris_header.php
	supapplication/New folder/controllers/accounts.php
	supapplication/New folder/controllers/examination.php
	supapplication/New folder/views/admin/batch/editbatch.php
	supapplication/New folder/views/admin/city/viewcities.php
	supapplication/New folder/views/admin/program_fee/view_program_fee.php
	supapplication/New folder/views/admin/program_fees/programfees.php
	supapplication/New folder/views/admin/session/addsession.php
	supapplication/New folder/views/admin/session/viewsessions.php
	supapplication/New folder/views/admin_ace/_admin_side_menu - Origional.php
	supapplication/New folder/views/admissions/initial_form/add_initial_form.php
	supapplication/New folder/views/admissions/initial_form/edit_initial_form.php
	supapplication/New folder/views/admissions/inquiry/addinquiry.php
	supapplication/New folder/views/admissions/inquiry/editinquiry.php
	supapplication/New folder/views/admissions/inquiry/viewinquiries.php
	supapplication/New folder/views/index.html
	supapplication/controllers/admin.php
	supapplication/controllers/index.html
	supapplication/models/admin_model.php
	supapplication/views/admin/bank/addbank.php
	supapplication/views/admin/bank/editbank.php
	supapplication/views/admin/bank/viewbanks.php
	supapplication/views/admin/bank_account/add_bank_account.php
	supapplication/views/admin/bank_account/edit_bank_account.php
	supapplication/views/admin/bank_account/view_bank_accounts.php
	supapplication/views/admin/campaign/addcampaign.php
	supapplication/views/admin/campaign/editcampaign.php
	supapplication/views/admin/campaign/viewcampaigns.php
	supapplication/views/admin/campus/addcampus.php
	supapplication/views/admin/campus/editcampus.php
	supapplication/views/admin/campus/viewcampuses.php
	supapplication/views/admin/city/addcity.php
	supapplication/views/admin/city/editcity.php
	supapplication/views/admin/city/viewcities.php
	supapplication/views/admin/installments/add_installment_form.php
	supapplication/views/admin/installments/edit_installment_form.php
	supapplication/views/admin/installments/view_installment_form.php
	supapplication/views/admin/institutes/addinstitutes.php
	supapplication/views/admin/institutes/editinstitute.php
	supapplication/views/admin/institutes/viewinstitutes.php
	supapplication/views/admin/login.php
	supapplication/views/admin/program/add_program.php
	supapplication/views/admin/program/edit_program.php
	supapplication/views/admin/program/view_programs.php
	supapplication/views/admin/program_department/add_prog_dept.php
	supapplication/views/admin/program_department/edit_prog_dept.php
	supapplication/views/admin/program_department/view_prog_depts.php
	supapplication/views/admin/reference/addreference.php
	supapplication/views/admin/reference/editreference.php
	supapplication/views/admin/reference/viewreferences.php
	supapplication/views/admin/section/addsection.php
	supapplication/views/admin/section/editsection.php
	supapplication/views/admin/section/viewsections.php
	supapplication/views/admin/session/addsession.php
	supapplication/views/admin/session/viewsessions.php
	supapplication/views/admin_ace/admin_footer.php
	supapplication/views/admin_ace/admin_side_menu.php
	supapplication/views/admin_ace/dashboard.php