Bugfixes.
Bugfixes
Merge branch 'master' of https://github.com/maciekf/guessr

Conflicts:
	server/server/contentProvider/views.py
Bugfixes