Merge origin/master

Conflicts:
	application/config/config.php
	application/config/pagination.php
	application/controllers/admin_page.php
	application/controllers/admision.php
	application/controllers/application.php
	application/controllers/change_form.php
	application/controllers/register.php
	application/controllers/upload.php
	application/models/admin.php
	application/models/admision_model.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/Admision/chang_pwd.php
	application/views/Admision/chang_pwd_1.php
	application/views/admin/Headerlogin.php
	application/views/admin/add_page.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/application/upload.php
	application/views/clogin.php
	application/views/home.php
	application/views/registration_confirmation.php
	assets/css/bootstrap.css
	assets/css/pgis.css
	assets/css/sb-admin.css
	assets/js/submision_checking.js
	uploads/emanoble/IMG_20131219_153145.jpg
	uploads/emanoble/images.jpg