Merge branch 'master' of https://github.com/Monduiz/OL-explorer

Conflicts:
OLMCSDfr.