Fix merge conflict Merge branch 'master' of https://github.com/brusselopole/Worldopole into mythic-recents
Fix merge conflict
Merge branch 'master' of https://github.com/brusselopole/Worldopole into mythic-recents

 Conflicts:
	core/process/data.loader.php

brusselopole/Worldopole,PoUpA/Worldopole,PoUpA/Worldopole,brusselopole/Worldopole,PoUpA/Worldopole,PoUpA/Worldopole,brusselopole/Worldopole,brusselopole/Worldopole