Various small fixes for subcategories
Merge pull request #45 from cdman/development

Various small fixes for subcategories
Merge pull request #46 from udacity/development

Merge development