fix routes
Merge remote-tracking branch 'upstream/master'
fix routes
Merge remote-tracking branch 'upstream/master'
fix friendly id on category and tag
Merge remote-tracking branch 'upstream/master'
fix tag_slug migration
Merge remote-tracking branch 'upstream/master'
	new file:   app/assets/javascripts/categories.js.coffee
	new file:   app/assets/javascripts/tags.js.coffee
	new file:   app/assets/stylesheets/categories.css.scss
	new file:   app/assets/stylesheets/tags.css.scss
	new file:   app/controllers/categories_controller.rb
	new file:   app/controllers/tags_controller.rb
	new file:   app/helpers/tags_helper.rb
	new file:   app/views/categories/index.html.erb
	new file:   app/views/categories/show.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/pages/home.html.erb
 	new file:   app/views/tags/index.html.erb
	new file:   app/views/tags/show.html.erb
	new file:   test/controllers/tags_controller_test.rb
	new file:   test/helpers/tags_helper_test.rb
all