Flere spm
Merge branch 'master' of github.com:danielab/EmergencyGame

Conflicts:
	DjangoApp/populate.py