画像UP
Merge remote-tracking branch 'aoki/master'

Conflicts:
	app/controllers/fuguais_controller.rb
	app/views/fuguais/_form_show_fuguai.html.erb
	db/migrate/20130205055927_remove_columns_to_fuguais.rb_01
	db/schema.rb