Merge jkerihuel/mapistore-python-DEMO back into jkerihuel/mapistore-python