not a perfect day if all dailies were grey dailies [fixed]

Resolved conflicts from https://github.com/HabitRPG/habitrpg-shared/pull/98.
Since in that pull-request 'from' is an 'unknown repository' (probably branch was deleted) I don't know how to include original commits from @Alys.
Tested on local copy - seem to work well.