more challenge decription data
Merge branch 'master' of github.com:beak-lab/swell

Conflicts:
	app/scripts/modules/challenge/entities/challenge.js
	app/scripts/modules/challenge/show/controller.js
	app/scripts/modules/challenge/show/templates/challenge_show_layout.dust
passing in full model
Merge branch 'master' of github.com:beak-lab/swell