Merge pull request #45 from cdman/development

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

Merge development
Merge pull request #48 from cdman/development

Add support for options request to make CORS work
Merge pull request #49 from udacity/development

Merge development
Merge pull request #50 from cdman/development

Reverting CORS support, added it from the webserver config
Merge pull request #51 from udacity/development

Merge development
Fix for validator error when creating a topic for a category without subcategories.
Merge pull request #52 from udacity/topic-fix-boris

Fix for validator error for creating topics for a category without subcategories
Merge pull request #53 from udacity/development

Merge development
Merge pull request #54 from cdman/development

fix(login): properly activate the user after creation
Merge pull request #55 from udacity/development

Merge development
Use correct email for users