changing class template 'base' to 'class_listing'
Merge branch 'master' of github.com:TracyWebTech/xavier