Merge branch 'editorsearch' of github.com:Zeega/Zeega-Core into stable
Merge branch 'master' of github.com:Zeega/Zeega-Core into stable
Merge branch 'mapfix' of github.com:Zeega/Zeega-Core into stable
Merge branch 'staging' into stable