Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/models/game_models.py