fix taggings
	modified:   app/controllers/tags_controller.rb
	modified:   app/views/pages/home.html.erb
	modified:   app/views/tags/show.html.erb
Merge remote-tracking branch 'upstream/master'
fix taggings