#73 Checklist progressbar design was done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/cards_controller.rb