勤怠入力画面計算処理修正20140609
Merge branch 'liuyj' into dev100
Merge branch 'dev100' of ssh://git@github.com/adminacm/share.git into dev100