Merge branch 'master' of github.com:Neamar/kingdoms into feature-event

Conflicts:
	kingdom/models.py
Tests error
Merge branch 'feature-event' of github.com:Neamar/kingdoms into feature-event
Merge branch 'feature-event' of github.com:Neamar/kingdoms into feature-event
Correct errors
Finally got the test working for coherence between PEA.EA.E and PEA.PE.E
Merge branch 'feature-event' into BOM

Conflicts:
	config/settings.py
	internal/models.py