categories scaffold #time 15min
Merge branch 'master' of github.com:mckenn/iternal

Conflicts:
	app/models/admin/category.rb