Some documentation / spacing fixes additions.
Fix for null subcategories.
Merge branch 'master' into cleanup

Conflicts:
	controllers/author_controller.py
Merge pull request #17 from rolsen/data_fix

Fix for null subcategories.
Merge pull request #15 from rolsen/cleanup

Some documentation / spacing fixes additions.
Got editing working again.
Merge branch 'master' into module

Conflicts:
	controllers/public_controller.py