[WIP] Adds categories to tags - adds 'searches' scaffold with tags grouped by cat
Adds categories to tags
Lucas' suggestion
Merge branch 'master' into tag_categories

Conflicts:
	config/routes.rb
	db/schema.rb
Added wireframes to repo
Updated wireframes
remove callback for User#name
dashboard controller
Fixes tag_spec
Merge pull request #27 from rhokbrisbane/user_name

User name
Merge branch 'master' into tag_categories

Conflicts:
	app/models/user.rb
Merge pull request #25 from rhokbrisbane/tag_categories

Tag categories
User#display_name redundant
Merge branch 'master' into kids

Conflicts:
	app/models/user.rb
	db/schema.rb