Merge origin/master

Conflicts:
	application/config/config.php
	application/controllers/admision.php
	application/controllers/application.php
	application/controllers/change_form.php
	application/controllers/register.php
	application/controllers/upload.php
	application/models/application_form.php
	application/models/changepass.php
	application/models/model_form.php
	application/views/Admision/Headerlogin.php
	application/views/Admision/admision.php
	application/views/Admision/applicant_detail.php
	application/views/application/Headerlogin.php
	application/views/application/accademic_qual.php
	application/views/application/additional.php
	application/views/application/capplication.php
	application/views/application/chang_pwd.php
	application/views/application/details.php
	application/views/application/personal_info.php
	application/views/application/referees.php
	application/views/clogin.php
	application/views/home.php
	application/views/registration_confirmation.php
	assets/css/pgis.css
	assets/css/sb-admin.css
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	application/config/config.php
	application/controllers/admision.php
	application/controllers/application.php
	application/controllers/change_form.php
	application/controllers/register.php
	application/controllers/upload.php
	application/models/application_form.php
	application/models/changepass.php
	application/models/model_form.php
	application/views/Admision/Headerlogin.php
	application/views/Admision/admision.php
	application/views/Admision/applicant_detail.php
	application/views/application/Headerlogin.php
	application/views/application/accademic_qual.php
	application/views/application/additional.php
	application/views/application/capplication.php
	application/views/application/chang_pwd.php
	application/views/application/details.php
	application/views/application/personal_info.php
	application/views/application/referees.php
	application/views/clogin.php
	application/views/home.php
	application/views/registration_confirmation.php
	assets/css/pgis.css
	assets/css/sb-admin.css
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	application/config/config.php
	application/controllers/admision.php
	application/controllers/application.php
	application/controllers/change_form.php
	application/controllers/register.php
	application/controllers/upload.php
	application/models/application_form.php
	application/models/changepass.php
	application/models/model_form.php
	application/views/Admision/Headerlogin.php
	application/views/Admision/admision.php
	application/views/Admision/applicant_detail.php
	application/views/application/Headerlogin.php
	application/views/application/accademic_qual.php
	application/views/application/additional.php
	application/views/application/capplication.php
	application/views/application/chang_pwd.php
	application/views/application/details.php
	application/views/application/personal_info.php
	application/views/application/referees.php
	application/views/clogin.php
	application/views/home.php
	application/views/registration_confirmation.php
	assets/css/pgis.css
	assets/css/sb-admin.css
	nbproject/project.properties
	nbproject/project.xml
Commited by mkulasi
Commited by mkulasi
Commited by mkulasi
Merge origin/master

Conflicts:
	.gitignore
	application/views/Admision/Headerlogin.php