#8082: [GRIN] [Diplomica] Upload Area Anpassungen - custom image for 'order own book' page
Merge remote-tracking branch 'origin/version-4.6' into Diplom-Upload-Area-Anpassungen_version-4.6_t8082
#8082: [GRIN] [Diplomica] Upload Area Anpassungen - fixing catalog link on nav menu
#8435: [Diplom] Broken Links in main navigation - fixing link to catalogue
Merge remote-tracking branch 'origin/version-4.6' into Diplom-Upload-Area-Anpassungen_version-4.6_t8082
#8610: ReferenceError in diplom
Merge remote-tracking branch 'origin/version-4.6' into Diplom-Upload-Area-Anpassungen_version-4.6_t8082
Merge remote-tracking branch 'origin/version-4.6' into Diplom-Upload-Area-Anpassungen_version-4.6_t8082

Conflicts:
	brand-files/templates/Grin.gtpl