get the names right on feed view
merge stuff
Merge branch 'master' of https://github.com/kohlmeier/ssrs