Merge origin/master
Merge origin/master

Conflicts:
	application/config/database.php
	application/controllers/accountant_controller.php
	application/controllers/admin_controller.php
	application/models/accountant_model.php
	application/models/admin_model.php
	application/views/accountant_credit.php
	application/views/accountant_details.php
	application/views/accountant_diesel.php
	application/views/accountant_diesel_credit.php
	application/views/accountant_expenditure.php
	application/views/accountant_kerosine.php
	application/views/accountant_kerosine_credit.php
	application/views/accountant_oil.php
	application/views/accountant_oil_credit.php
	application/views/accountant_overview.php
	application/views/accountant_overview1.php
	application/views/accountant_overview2.php
	application/views/accountant_overview3.php
	application/views/accountant_problem.php
	application/views/accountant_report.php
	application/views/accountant_report1.php
	application/views/accountant_report2.php
	application/views/accountant_report3.php
	application/views/accountant_smg.php
	application/views/accountant_view.php
	application/views/accountant_views.php
	application/views/admin_dashbord.php
	application/views/admin_message.php
	application/views/customer_diesel.php
	application/views/customer_kerosine.php
	application/views/customer_oil.php
	application/views/dashbord.php
	application/views/diesel_conts.php
	application/views/diesel_seller_info.php
	application/views/dieselreport_info.php
	application/views/expenditure_cash.php
	application/views/expenditureinfo.php
	application/views/footer.php
	application/views/general_report.php
	application/views/header2.php
	application/views/kerosine_conts.php
	application/views/kerosine_seller_info.php
	application/views/kerosinereport_info.php
	application/views/notification_details.php
	application/views/oil_conts.php
	application/views/oil_seller_info.php
	application/views/oilreport_info.php
	application/views/password_change.php
	application/views/password_change1.php
	application/views/password_change2.php
	application/views/petrol_seller_info.php
	application/views/petrolreport_info.php
	application/views/problem_user.php
	application/views/problem_view.php
	application/views/profile_view.php
	application/views/register_view.php
	application/views/summary_view.php
	system/helpers/dompdf/lib/fonts/log.htm