#4 Async Load Detail Card Content
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/helpers/deckster_helper.rb