Merge branch 'master' into trust-game

Conflicts:
	trust/models.py
trust game update
traveler_dilemma updates
Merge branch 'master' into traveler-dilemma
Update Claim.html

add instructions
Update Feedback.html

bold
Update models.py

spelling
Merge pull request #7 from oTree-org/traveler-dilemma

Traveler dilemma