dummy commit.
Merge branch 'master' of https://github.com/xmf-xmodeler/Mosaic

Conflicts:
	ini.txt