fixing up parts of the cached content loading inconsistencies, message if there are no sxs
build, resolve conflicts
:
Merge pull request #275 from theresaanna/master

Niceifying sxs sidebar things