Fixes for sbp and xap97net

I think this is all for xap97net and sbp. I'm going to continue with menu creation.
Can you prepare the new template / theme so I can integrate it with this?

By the way, I see 2 files being overwritten by the old version:

    modified:   xap97net/admin-modules.markdown
    modified:   xap97net/client-side-caching.markdown

I have refix that.
Please be careful when merging so it's not breaking anything.