#61 Card form show/hide toggle was done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/views/lists/_list.html.haml
Conflict resolved