Fixed senyoni's bug and implemented add history&in-service training buttons
Merge branch 'master' of github.com:hrisproject/hris