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

Conflicts:
	app/helpers/application_helper.rb
	db/schema.rb