Commit
Merge branch 'master' of https://github.com/masami-fujimaki/SIP

Conflicts:
	appli/EmployeeTypeCostBatch.php