Merge origin/master

Conflicts:
	application/controllers/con_proc_monthly_report_generate.php
	application/controllers/con_set_worker_profile.php
	application/models/mod_monthly_wages_detail.php
	application/models/mod_set_employee_salary.php
	application/views/temp/worker_profile/edit.php
Merge origin/master

Conflicts:
	application/controllers/con_proc_monthly_report_generate.php
	application/controllers/con_set_worker_profile.php
	application/models/mod_monthly_wages_detail.php
	application/models/mod_set_employee_salary.php
	application/views/temp/worker_profile/edit.php
Merge origin/master

Conflicts:
	application/controllers/con_proc_monthly_report_generate.php
	application/controllers/con_set_worker_profile.php
	application/models/mod_monthly_wages_detail.php
	application/models/mod_set_employee_salary.php
	application/views/temp/worker_profile/edit.php