chenge routes
Merge branch 'modifyurl' into photoupload

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/comment.js
	app/views/blog/_userinfo.html.erb
	app/views/user/index.html.erb
	config/routes.rb
still merging...
comment bug fix