Category seeds added.
added categories to articles
Merge branch 'categories' of https://github.com/Caraheacock/project-ocs-wiki into categories

Conflicts:
	wiki/config/routes.rb
Merge branch 'master' into categories