Merge branch 'master' of https://github.com/eblondel/cleangeo

# Conflicts:
#	README.md