Merge branch 'cc-5405' of https://github.com/sourcefabric/Airtime into 2.5.x
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
CC-5555: Fix user preferences logic in preferences cache

* Fixes stream settings not dislaying
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x