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
(fix #5)
Merge branch 'feature-event' into BOM

Conflicts:
	config/settings.py
	internal/models.py
Started removing execute calls from the "signals.py"
Done for Missions and Triggers
Started refactoring the code to eliminate param
update unicode of missions grids
Remove PendingMission after execution
Can't affect after start
Update path for Codemirror
Merge branch 'BOM' of github.com:Neamar/kingdoms

Conflicts:
	config/settings.py
	mission/models.py
PEP8
Add context for missions
Add context for mission grid
Merge branch 'hugo' of github.com:Neamar/kingdoms
Merge branch 'master' of github.com:Neamar/kingdoms into hugo
Update kingdom docs
Readme doc