Fixed Bug #171
Fixed Bug #170
Merge branch 'master' of https://github.com/creative-active-technology/inkubator-hrm.git