Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients
Merge branch 'develop' into christmas_app
Merge pull request #706 from owncloud/christmas_app

Winter holidays fix