Merge pull request #573 from jonezy/development

sneaking this into tomorrow's release.
Merge pull request #574 from jonezy/development

last F56 homepage changes were wrong.
turned back on package merging.

Signed-off-by: Chris Jones <chris@jonezy.org>
added the ability to show grouped packages on staging only

Signed-off-by: Chris Jones <chris@jonezy.org>
Upadted F56 legal popup
Merge pull request #576 from jonezy/package-grouping

Package grouping
Merge pull request #575 from shutter111/development

Upadted F56 legal popup