fixes
Merge branch 'master' of https://github.com/ardian/django-hr