charge confirmation
Merge branch 'master' of https://github.com/zhouhang/pingtai

Conflicts:
	app/views/shared/admin/_left.html.erb
	db/schema.rb