fixed some issues related to the recent renaming, plus some unrelated issues regarding categories
Merge branch 'Dev' of https://github.com/mortie/jsSiteBuilder into Dev