Added some minor changes and fixed some problems with images

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Added some minor changes and fixed some problems with images

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Added some minor changes and fixed some problems with images

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Merge branch 'master' of https://github.com/leifos/ifind
Merge branch 'master' of https://github.com/leifos/ifind
Added some minor changes and fixed some problems with images

Conflicts:
	framework/models/game_models.py
Added some minor changes and fixed some problems with images

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