Merge pull request #41 from udacity/development

Merged development
Merge pull request #44 from udacity/development

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

Various small fixes for subcategories