fix an issue where an incorrect css or js file could be included
Merge pull request #1 from thebuggenie/branch-31

update to head