Sprint 1's half ass push
Resolve orphaned branch from other system.

Merge branch 'master' of github.com:SwampCo/Motherlode

Conflicts:
	app/models/category.rb