LAMBDA-123: refactoring :)
Merge branch 'newcontentfeed' of github.com:LambdaCast/LambdaCast into newcontentfeed