some fix
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/controllers/admin/cards_controller.rb
	db/schema.rb