development level
.htaccess
Merge branch 'master' of https://github.com/indrawdev/jobportal

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/config/database.php
	application/config/hooks.php
	application/controllers/contact.php
	application/controllers/employer.php
	application/controllers/errors.php
	application/controllers/find.php
	application/controllers/home.php
	application/controllers/job.php
	application/controllers/jobseeker.php
	application/controllers/message.php
	application/controllers/page.php
	application/controllers/payment.php
	application/controllers/resume.php
	application/controllers/search.php
	application/models/email_mod.php
	application/models/generate_mod.php
	application/models/upload_mod.php
	application/views/contact_v.php
	application/views/employer/application_v.php
	application/views/employer/employer_reg.php
	application/views/employer/employer_v.php
	application/views/employer/post_job.php
	application/views/find_v.php
	application/views/home_v.php
	application/views/include/footer.php
	application/views/include/header.php
	application/views/job/display_v.php
	application/views/jobseeker/application_v.php
	application/views/jobseeker/jobseeker_reg.php
	application/views/jobseeker/post_resume.php
	application/views/jobseeker/resume_list.php
	application/views/message/list.php
	application/views/message/reply.php
	application/views/package/package_employer.php
	application/views/package/package_jobseeker.php
	application/views/page/terms_v.php
	application/views/payment/confirmation_v.php
	application/views/payment/invoice_v.php
	application/views/payment/payment_v.php
	application/views/redirect/404.php
	application/views/search_v.php
	application/views/template.php
	assets/css/bootstrap.min.css
	assets/css/custom.css
	system/helpers/conf_helper.php