card steps
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/admin/cards/_form.html.erb