Revert "Revert "Merge branch 'master' of https://github.com/paillardf/Work-Hub""

This reverts commit e839fb1e0af4e5a08fb9a3da69355e807073350f.