Merge remote-tracking branch 'origin/master'
Merge branch 'master' into summary_attendance
Merge remote-tracking branch 'origin'
勤務状況報告書締め処理作成
勤務状況報告書編集機能改善
資格申請　引き続き作成中
Merge remote-tracking branch 'origin/qa'
勤務状況報告書編集機能改善
勤務状況集計表PDF作成中
勤務状況集計表PDF作成中
Merge remote-tracking branch 'origin/summary_attendance'

Conflicts:
	app/controllers/attendances_controller.rb