Integrating 'commit_and_push.py' script into './otree commit_and_push'.
.
.
removed duplicated apps
Update models.py

change description
Merge branch 'master' into trust-game
Merge branch 'master' into trust-game

Conflicts:
	trust/models.py
trust game update