Merge branch 'dashboard' of https://github.com/festivit/festivit into dashboard
 fixed decline
Merge remote-tracking branch 'upstream/dashboard' into dashboard