Merge origin/master

Conflicts:
	application/controllers/accountant_controller.php
	application/controllers/admin_controller.php
	application/controllers/general_accountant.php
	application/controllers/register_controller.php
	application/models/accountant_model.php
	application/models/admin_model.php
	application/views/accountant_diesel.php
	application/views/accountant_kerosine.php
	application/views/accountant_oil.php
	application/views/accountant_overview.php
	application/views/accountant_overview1.php
	application/views/accountant_overview2.php
	application/views/accountant_overview3.php
	application/views/accountant_view.php
	application/views/admin_dashbord.php
	application/views/footer.php
	application/views/header2.php
	application/views/petrol_seller_info.php
Merge origin/master

Conflicts:
	application/models/admin.php