stashed changes merged
Merge branch 'develop' of github.com:joshsoftware/intranet into develop
invitation email content changed, moved date of relieving to employee
detail model, home page view updated